use GtkTextView instead of GtkEntry for the secret value (#7094), also add text to avoid user confusion between secret name/value (#7085)

1 files changed, 20 insertions, 7 deletions

diff --git a/src/anastasis/anastasis-gtk_action.c b/src/anastasis/anastasis-gtk_action.c
index ca3406a..8581808 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1225,7 +1225,7 @@ action_secret_editing (void)
 
   AG_insensitive ("anastasis_gtk_main_window_forward_button");
   AG_sensitive ("anastasis_gtk_enter_secret_open_button");
-  AG_sensitive ("anastasis_gtk_enter_secret_entry");
+  AG_sensitive ("anastasis_gtk_enter_secret_textview");
   AG_hide ("anastasis_gtk_secret_clear_file_button");
   AG_hide ("anastasis_gtk_secret_clear_text_button");
   AG_hide ("anastasis_gtk_secret_file_name_hbox");
@@ -1292,8 +1292,18 @@ action_secret_editing (void)
            (0 == strlen (text)) )
         text = NULL;
       if (! AG_in_secret_editing)
-        update_entry ("anastasis_gtk_enter_secret_entry",
-                      text);
+      {
+        GtkTextBuffer *tb = GCG_get_main_window_object (
+          "anastasis_gtk_enter_secret_textbuffer");
+        const char *old;
+
+        old = gtk_entry_get_text (tb);
+        if (0 != strcmp (old,
+                         text))
+          gtk_text_buffer_set_text (tb,
+                                    text,
+                                    -1);
+      }
       update_label ("anastasis_gtk_secret_file_name_label",
                     filename);
       if ( (NULL != text) ||
@@ -1308,7 +1318,7 @@ action_secret_editing (void)
       }
       if (NULL != filename)
       {
-        AG_insensitive ("anastasis_gtk_enter_secret_entry");
+        AG_insensitive ("anastasis_gtk_enter_secret_textbuffer");
         AG_show ("anastasis_gtk_secret_clear_file_button");
         AG_show ("anastasis_gtk_secret_file_name_hbox");
         AG_hide ("anastasis_gtk_secret_file_chooser_hbox");
@@ -1318,15 +1328,18 @@ action_secret_editing (void)
     else
     {
       /* secret is NULL */
-      update_entry ("anastasis_gtk_enter_secret_entry",
-                    NULL);
+      GtkTextBuffer *tb = GCG_get_main_window_object (
+        "anastasis_gtk_enter_secret_textbuffer");
 
+      gtk_text_buffer_set_text (tb,
+                                "",
+                                -1);
     }
     if ( (NULL == name) ||
          (0 == strlen (name) ) )
       AG_focus ("anastasis_gtk_secret_name_entry");
     else if (NULL == filename)
-      AG_focus ("anastasis_gtk_enter_secret_entry");
+      AG_focus ("anastasis_gtk_enter_secret_textbuffer");
     GNUNET_JSON_parse_free (spec);
   }
   AG_sensitive ("anastasis_gtk_main_window_prev_button");