1 files changed, 9 insertions, 21 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 196726a1..3f84c820 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -353,9 +353,8 @@ GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
  * @param ts the tree selection object
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support this) */
-static void
-metadata_selection_changed_cb (GtkTreeSelection *ts,
+void
+GNUNET_GTK_edit_publication_metadata_treeview_selection_changed_cb (GtkTreeSelection *ts,
                                gpointer user_data)
 {
   struct EditPublicationDialogContext *ctx = user_data;
@@ -607,9 +606,8 @@ GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (Gt
  * @param ts the tree selection object
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support this) */
-static void
-keywords_selection_changed_cb (GtkTreeSelection *ts,
+void
+GNUNET_GTK_edit_publication_keyword_list_treeview_selection_changed_cb (GtkTreeSelection *ts,
                                gpointer user_data)
 {
   struct EditPublicationDialogContext *ctx = user_data;
@@ -1057,7 +1055,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
         /* fall back to Gtk mime-detection; this only works on GNU */
         GFileInfo *finfo;
         const char *gmime;
-        
+
         finfo = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
                                    0, NULL, NULL);
         gmime = g_file_info_get_attribute_string (finfo,
@@ -1241,11 +1239,11 @@ file_information_import (void *cls,
  *
  * @param parent parent window of the dialog
  * @param fip information about the file information that is to be edited
- * @param is_namespace_edit GNUNET_YES if we are editing a namespace advertisement;
+ * @param is_namespace_edit #GNUNET_YES if we are editing a namespace advertisement;
  *        this means that keywords are required and that a "root" can be
  *        entered
  * @param cb function to call when the dialog is closed
- * @param cb_cls closure for 'cb'
+ * @param cb_cls closure for @a cb
  */
 void
 GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
@@ -1260,10 +1258,8 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   GtkLabel *index_label;
   GtkLabel *root_label;
   struct EditPublicationDialogContext *ctx;
-  GtkTreeSelection *meta_selection;
-  GtkTreeSelection *keywords_selection;
 
-  ctx = GNUNET_malloc (sizeof (struct EditPublicationDialogContext));
+  ctx = GNUNET_new (struct EditPublicationDialogContext);
   ctx->fip = fip;
   ctx->preview_changed = GNUNET_NO;
   ctx->allow_no_keywords = is_namespace_edit ? GNUNET_NO : GNUNET_YES;
@@ -1273,7 +1269,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   ctx->meta_combo_selected_type_id = -1;
   ctx->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_edit_publication.glade", ctx);
 
-  if (ctx->builder == NULL)
+  if (NULL == ctx->builder)
   {
     GNUNET_free (ctx);
     return;
@@ -1365,14 +1361,6 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   gtk_widget_set_visible (GTK_WIDGET (root_label),
                           is_namespace_edit ? TRUE : FALSE);
 
-  /* FIXME-GTK3: these signal handlers can be set by (modern) versions of Glade */
-  keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
-  g_signal_connect (G_OBJECT (keywords_selection), "changed",
-                    G_CALLBACK (keywords_selection_changed_cb), ctx);
-  meta_selection = gtk_tree_view_get_selection (ctx->meta_treeview);
-  g_signal_connect (G_OBJECT (meta_selection), "changed",
-                    G_CALLBACK (metadata_selection_changed_cb), ctx);
-
   /* import meta data and options */
   GNUNET_FS_file_information_inspect (fip, &file_information_import, ctx);