modernizing use of Gtk3 APIs

5 files changed, 25 insertions, 43 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index f9c2f858..1cd8c70a 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -764,7 +764,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
 
   /* Allow multiple selection in metadata view; */
-  /* FIXME-GTK3: this can be done within (modern versions of) glade */
+  /* FIXME-GTK3: this can be done within (modern versions of) glade
+     (However, this needs GTK >= 3.2, we currently target 3.0) */
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (main_context.md_treeview),
                                GTK_SELECTION_MULTIPLE);
   if (NULL == getenv ("GNUNET_FS_GTK_PLUG"))
diff --git a/src/fs/gnunet-fs-gtk_main-window-connection.c b/src/fs/gnunet-fs-gtk_main-window-connection.c
index 9b3e3ed7..af817f2f 100644
--- a/src/fs/gnunet-fs-gtk_main-window-connection.c
+++ b/src/fs/gnunet-fs-gtk_main-window-connection.c
@@ -34,12 +34,13 @@
  * @param tooltip new tooltip text
  */
 void
-GNUNET_FS_GTK_update_connection_indicator (
-    struct GNUNET_GTK_MainWindowContext *main_ctx,
-    gboolean connected, const gchar *tooltip)
+GNUNET_FS_GTK_update_connection_indicator (struct GNUNET_GTK_MainWindowContext *main_ctx,
+                                           gboolean connected,
+                                           const gchar *tooltip)
 {
-  gtk_image_set_from_stock (main_ctx->connection_indicator,
-      connected ? "gtk-yes" : "gtk-no", GTK_ICON_SIZE_BUTTON);
+  gtk_image_set_from_icon_name (main_ctx->connection_indicator,
+                                connected ? "network-transmit-receive" : "network-offline",
+                                GTK_ICON_SIZE_BUTTON);
   gtk_widget_set_tooltip_text (GTK_WIDGET (main_ctx->connection_indicator),
       tooltip);
 }
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index b658afbc..b5d6e690 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -557,8 +557,8 @@ update_selectivity_edit (struct MainPublishingDialogContext *ctx)
  * @param ts the changed selection
  * @param user_data master publishing dialog context of our window
  */
-static void
-selection_changed_cb (GtkTreeSelection * ts,
+void
+GNUNET_GTK_master_publish_dialog_file_informatino_treeview_selection_changed_cb (GtkTreeSelection * ts,
                       gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
@@ -899,8 +899,9 @@ GNUNET_GTK_master_publish_dialog_identifier_entry_changed_cb (GtkWidget *widget,
  * @param ts the changed selection
  * @param user_data master publishing dialog context of our window
  */
-static void
-identifiers_selection_changed_cb (GtkTreeSelection *ts, gpointer user_data)
+void
+GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_selection_changed_cb (GtkTreeSelection *ts,
+                                                                                     gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
   GtkTreeIter iter;
@@ -2835,12 +2836,6 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
 
   g_signal_connect (ctx->identifiers_expander, "notify::expanded", G_CALLBACK (expander_callback), ctx);
 
-  /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade */
-  g_signal_connect (G_OBJECT (ctx->file_info_selection), "changed",
-                    G_CALLBACK (selection_changed_cb), ctx);
-  g_signal_connect (G_OBJECT (ctx->identifiers_selection), "changed",
-                    G_CALLBACK (identifiers_selection_changed_cb), ctx);
-
   cfg = GNUNET_FS_GTK_get_configuration ();
   ctx->identity = GNUNET_IDENTITY_connect (cfg,
                                            &add_namespace_to_ts,
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);
 
diff --git a/src/fs/gnunet-fs-gtk_unindex.c b/src/fs/gnunet-fs-gtk_unindex.c
index d7efdf8e..9977e5a6 100644
--- a/src/fs/gnunet-fs-gtk_unindex.c
+++ b/src/fs/gnunet-fs-gtk_unindex.c
@@ -279,8 +279,8 @@ GNUNET_FS_GTK_unindex_close_button_clicked_cb (GtkWidget * dummy,
  * @param ts the changed selection
  * @param user_data our unindex context
  */
-static void
-selection_changed_cb (GtkTreeSelection * ts,
+void
+GNUNET_FS_GTK_unindex_treeview_selection_changed_cb (GtkTreeSelection *ts,
                       gpointer user_data)
 {
   struct UnindexDialogContext *udc = user_data;
@@ -394,7 +394,7 @@ GNUNET_GTK_main_menu_unindex_activate_cb (GtkWidget * dummy,
     gtk_window_present (GTK_WINDOW (master_udc->dialog));
     return;
   }
-  udc = GNUNET_malloc (sizeof (struct UnindexDialogContext));
+  udc = GNUNET_new (struct UnindexDialogContext);
   udc->builder =
     GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_unindex.glade", udc);
   if (NULL == udc->builder)
@@ -418,9 +418,6 @@ GNUNET_GTK_main_menu_unindex_activate_cb (GtkWidget * dummy,
   toplevel = gtk_widget_get_toplevel (dummy);
   if (GTK_IS_WINDOW (toplevel))
     gtk_window_set_transient_for (GTK_WINDOW (udc->dialog), GTK_WINDOW (toplevel));
-  /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade */
-  g_signal_connect (G_OBJECT (udc->selection), "changed",
-                    G_CALLBACK (selection_changed_cb), udc);
   gtk_window_present (GTK_WINDOW (udc->dialog));
   master_udc = udc;
 }