-renaming and using our own builder in the open-URI dialog

2 files changed, 70 insertions, 50 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 2e19b9b6..0fc819d8 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -12,9 +12,9 @@ bin_PROGRAMS = gnunet-fs-gtk
 gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk.c gnunet-fs-gtk.h \
   gnunet-fs-gtk_about.c \
+  gnunet-fs-gtk_advertise-pseudonym.c \
   gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \
   gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \
-  gnunet-fs-gtk_advertise-pseudonym.c \
   gnunet-fs-gtk_create-pseudonym.c \
   gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \
   gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \
@@ -22,9 +22,9 @@ gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk_main-window-search.c \
   gnunet-fs-gtk_main-window-view-toggles.c \
   gnunet-fs-gtk_open-directory.c \
+  gnunet-fs-gtk_open-uri.c \
   gnunet-fs-gtk_publish-dialog.c \
   gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
-  gnunet-fs-gtk-main_window_file_download.c \
   gnunet-fs-gtk-main_window_namespace.c 
 gnunet_fs_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_download.c b/src/fs/gnunet-fs-gtk_open-uri.c
index 73ec3bb9..6962c2a5 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_download.c
+++ b/src/fs/gnunet-fs-gtk_open-uri.c
@@ -19,50 +19,18 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-main_window_file_download.c
+ * @file src/fs/gnunet-fs-gtk_open-uri.c
  * @author Christian Grothoff
  * @brief code for the 'Open URI' dialog.
  *
  * TODO:
  * - automatically populate dialog from clipboard?
- * - use our own builder instead of the main builder?
  */
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_download-save-as.h"
 #include "gnunet-fs-gtk.h"
 #include <gdk/gdkkeysyms.h>
 
-/**
- * User selected "Open URI" in main window.
- *
- * @param dummy some widget
- * @param user_data unused
- */
-void
-GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
-                                                    gpointer user_data)
-{
-  GtkBuilder *builder = GTK_BUILDER (user_data);
-  GtkWidget *dialog;
-  GtkTextBuffer *tb;
-  GtkTextIter ti_start;
-  GtkTextIter ti_end;
-
-  dialog = GTK_WIDGET (gtk_builder_get_object
-                       (builder, 
-                        "GNUNET_GTK_open_url_window"));
-  tb = GTK_TEXT_BUFFER (gtk_builder_get_object
-                        (builder,
-                         "GNUNET_GTK_open_url_dialog_url_textview_buffer"));
-  gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
-  gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
-  gtk_text_buffer_delete (tb, &ti_start, &ti_end);
-
-  /* TODO: query the clipboard, maybe there's valid URI in there?
-   * If so, get it. */
-  gtk_widget_show (dialog);
-}
-
 
 /**
  * User selected "execute" in the open-URI dialog.
@@ -84,13 +52,9 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
   struct GNUNET_FS_Uri *uri;
 
   builder = GTK_BUILDER (user_data);
-
   dialog =
       GTK_WIDGET (gtk_builder_get_object
                   (builder, "GNUNET_GTK_open_url_window"));
-
-  gtk_widget_hide (dialog);
-
   tb = GTK_TEXT_BUFFER (gtk_builder_get_object
                         (builder,
                          "GNUNET_GTK_open_url_dialog_url_textview_buffer"));
@@ -101,25 +65,32 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
 
   if (!GNUNET_GTK_get_selected_anonymity_level
       (builder, "main_window_search_anonymity_combobox", &anonymity_level))
+  {
+    GNUNET_break (0);
+    gtk_widget_destroy (dialog);
+    g_object_unref (G_OBJECT (builder));  
     return;
-
+  }
   uri = GNUNET_FS_uri_parse (uris, &perr);
   g_free (uris);
   if (uri == NULL)
   {
-    GNUNET_free (perr);
     /* Why was "execute" button sensitive!? */
     GNUNET_break (0);
+    GNUNET_free (perr);
+    gtk_widget_destroy (dialog);
+    g_object_unref (G_OBJECT (builder));  
     return;
   }
   if (GNUNET_FS_uri_test_sks (uri) || GNUNET_FS_uri_test_ksk (uri))
   {
-    fprintf (stderr, "Starting search!\n");
     GNUNET_break (NULL !=
                   GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri,
                                           anonymity_level,
                                           GNUNET_FS_SEARCH_OPTION_NONE, NULL));
     GNUNET_FS_uri_destroy (uri);
+    gtk_widget_destroy (dialog);
+    g_object_unref (G_OBJECT (builder));  
     return;
   }
   if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
@@ -130,10 +101,14 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
     dc->uri = uri;
     dc->anonymity = anonymity_level;
     GNUNET_FS_GTK_open_download_as_dialog (dc);
+    gtk_widget_destroy (dialog);
+    g_object_unref (G_OBJECT (builder));  
     return;
   }
   GNUNET_break (0);
   GNUNET_FS_uri_destroy (uri);
+  gtk_widget_destroy (dialog);
+  g_object_unref (G_OBJECT (builder));  
 }
 
 
@@ -148,10 +123,13 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
                                                      gpointer user_data)
 {
   GtkBuilder *builder = GTK_BUILDER (user_data);
+  GtkWidget *dialog;
 
-  gtk_widget_hide (GTK_WIDGET
-                   (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_open_url_window")));
+  dialog = GTK_WIDGET (gtk_builder_get_object
+                       (builder, 
+                        "GNUNET_GTK_open_url_window"));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+  g_object_unref (G_OBJECT (builder));
 }
 
 
@@ -161,6 +139,7 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
  * @param widget the window
  * @param event the deletion event
  * @param user_data the 'GtkBuilder' of the URI dialog
+ * @return TRUE (allow destruction)
  */
 gboolean
 GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget,
@@ -169,14 +148,11 @@ GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget,
 {
   GtkBuilder *builder = GTK_BUILDER (user_data);
 
-  gtk_widget_hide (GTK_WIDGET
-                   (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_open_url_window")));
+  g_object_unref (G_OBJECT (builder));
   return TRUE;
 }
 
 
-
 /**
  * User pushed a key in the open-URI dialog, check if we currently
  * have valid URI and if the key was 'RETURN', run the action.
@@ -247,4 +223,48 @@ GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb (GtkTextBuffer *
 }
 
 
-/* end of gnunet-fs-gtk-main_window_file_download.c */
+/**
+ * User selected "Open URI" in main window.
+ *
+ * @param dummy the menu entry
+ * @param user_data unused
+ */
+void
+GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
+                                                    gpointer user_data)
+{
+  GtkBuilder *builder;
+  GtkWidget *dialog;
+  GtkTextBuffer *tb;
+  GtkTextIter ti_start;
+  GtkTextIter ti_end;
+  GtkWidget *toplevel;
+
+  builder =
+    GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_url_dialog.glade", NULL);
+  if (NULL == builder)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  dialog = GTK_WIDGET (gtk_builder_get_object
+                       (builder, 
+                        "GNUNET_GTK_open_url_window"));
+  tb = GTK_TEXT_BUFFER (gtk_builder_get_object
+                        (builder,
+                         "GNUNET_GTK_open_url_dialog_url_textview_buffer"));
+  gtk_text_buffer_get_iter_at_offset (tb, &ti_start, 0);
+  gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
+  gtk_text_buffer_delete (tb, &ti_start, &ti_end);
+
+  /* FIXME-FEATURE: query the clipboard, maybe there's valid URI in there?
+   * If so, get it. */
+
+  toplevel = gtk_widget_get_toplevel (dummy);
+  if (GTK_IS_WINDOW (toplevel))
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel));
+  gtk_widget_show (dialog);
+}
+
+
+/* end of gnunet-fs-gtk_open-uri.c */