fixing crash for adding pseudonyms with no keywords by disabling OK button as long as there are no keywords (#2002)

2 files changed, 16 insertions, 1 deletions

diff --git a/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade b/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
index b83b6c9e..82cb3a2f 100644
--- a/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
+++ b/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
@@ -648,6 +648,7 @@
               <object class="GtkButton" id="GNUNET_GTK_advertise_pseudonym_confirm_button">
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
diff --git a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
index 2068d69a..bb3265e0 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
@@ -83,6 +83,7 @@ GNUNET_GTK_advertise_pseudonym_keyword_list_del_button_clicked_cb ()
   GtkTreeSelection *sel;
   GtkTreeModel *tm;
   GtkTreeIter iter;
+  GtkWidget *w;
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder,
@@ -94,6 +95,13 @@ GNUNET_GTK_advertise_pseudonym_keyword_list_del_button_clicked_cb ()
     return;
   }
   gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
+  if (TRUE != gtk_tree_model_get_iter_first (tm, &iter))
+  {
+    /* keyword list now empty, disable 'Ok' button! */
+    w = GTK_WIDGET (gtk_builder_get_object (builder, 
+                                            "GNUNET_GTK_advertise_pseudonym_confirm_button"));
+    gtk_widget_set_sensitive (w, FALSE);
+  }
 }
 
 
@@ -107,6 +115,7 @@ GNUNET_GTK_advertise_pseudonym_keyword_list_add_button_clicked_cb ()
   GtkEntry *entry;
   GtkListStore *ls;
   GtkTreeIter iter;
+  GtkWidget *w;
 
   ls = GTK_LIST_STORE (gtk_builder_get_object
                        (builder, "GNUNET_GTK_keyword_list_store"));
@@ -115,7 +124,12 @@ GNUNET_GTK_advertise_pseudonym_keyword_list_add_button_clicked_cb ()
                  (builder, "GNUNET_GTK_advertise_pseudonym_keyword_entry"));
   keyword = gtk_entry_get_text (entry);
   if (strlen (keyword) > 0)
-    gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, -1);
+  {
+    gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, -1); 
+    /* enable OK button */
+    w = GTK_WIDGET (gtk_builder_get_object (builder, "GNUNET_GTK_advertise_pseudonym_confirm_button"));
+    gtk_widget_set_sensitive (w, TRUE);
+  }
   gtk_entry_set_text (entry, "");
 }