-finishing implementation of pluggable dialogs (#3081)

1 files changed, 15 insertions, 5 deletions

diff --git a/src/lib/glade.c b/src/lib/glade.c
index 407e23f0..1d829788 100644
--- a/src/lib/glade.c
+++ b/src/lib/glade.c
@@ -99,11 +99,13 @@ GNUNET_GTK_get_tree_string (GtkTreeView * treeview, GtkTreePath * treepath,
  * @param filename name of the resource file to load
  * @param user_data user_data to pass to signal handlers,
  *        use "NULL" to pass the GtkBuilder itself.
+ * @param cb function to call before connecting signals
  * @return NULL on error
  */
 GtkBuilder *
-GNUNET_GTK_get_new_builder (const char *filename,
-                            void *user_data)
+GNUNET_GTK_get_new_builder2 (const char *filename,
+                             void *user_data,
+                             GtkBuilderConnectFunc cb)
 {
   char *glade_path;
   GtkBuilder *ret;
@@ -111,17 +113,25 @@ GNUNET_GTK_get_new_builder (const char *filename,
 
   ret = gtk_builder_new ();
   gtk_builder_set_translation_domain (ret, "gnunet-gtk");
-  GNUNET_asprintf (&glade_path, "%s%s", GNUNET_GTK_get_data_dir (), filename);
+  GNUNET_asprintf (&glade_path, "%s%s",
+                   GNUNET_GTK_get_data_dir (),
+                   filename);
   error = NULL;
   if (0 == gtk_builder_add_from_file (ret, glade_path, &error))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to load `%s': %s\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load `%s': %s\n"),
                 glade_path, error->message);
     g_error_free (error);
     GNUNET_free (glade_path);
     return NULL;
   }
-  gtk_builder_connect_signals (ret, (user_data == NULL) ? ret : user_data);
+  if (NULL == user_data)
+    user_data = ret;
+  if (NULL != cb)
+    gtk_builder_connect_signals_full (ret, cb, user_data);
+  else
+    gtk_builder_connect_signals (ret, user_data);
   GNUNET_free (glade_path);
   return ret;
 }