1 files changed, 30 insertions, 39 deletions

diff --git a/src/fs/gnunet-fs-gtk_open-uri.c b/src/fs/gnunet-fs-gtk_open-uri.c
index 7c0900fc..93a164cc 100644
--- a/src/fs/gnunet-fs-gtk_open-uri.c
+++ b/src/fs/gnunet-fs-gtk_open-uri.c
@@ -28,11 +28,38 @@
  */
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_download-save-as.h"
+#include "gnunet-fs-gtk_open-uri.h"
 #include "gnunet-fs-gtk.h"
 #include <gdk/gdkkeysyms.h>
 
 
 /**
+ * Handle a URI string by running the appropriate action.
+ *
+ * @param uris string we got
+ * @param anonymity_level anonymity level to use
+ * @return GNUNET_OK on success, GNUNET_NO if the URI type is not supported, GNUNET_SYSERR if we failed to
+ *         parse the URI
+ */
+int
+GNUNET_FS_GTK_handle_uri_string (const char *uris,
+                                 guint anonymity_level)
+{
+  struct GNUNET_FS_Uri *uri;
+  char *perr;
+
+  uri = GNUNET_FS_uri_parse (uris, &perr);
+  if (uri == NULL)
+  {
+    GNUNET_free (perr);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_FS_GTK_handle_uri (uri, anonymity_level);
+  return GNUNET_OK;
+}
+
+
+/**
  * User selected "execute" in the open-URI dialog.
  * 
  * @param button the execute button
@@ -48,9 +75,7 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
   GtkTextIter ti_start;
   GtkTextIter ti_end;
   guint anonymity_level;
-  char *perr;
   char *uris;
-  struct GNUNET_FS_Uri *uri;
 
   dialog =
       GTK_WIDGET (gtk_builder_get_object
@@ -62,7 +87,6 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
   gtk_text_buffer_get_iter_at_offset (tb, &ti_end, -1);
 
   uris = gtk_text_buffer_get_text (tb, &ti_start, &ti_end, FALSE);
-
   if (!GNUNET_GTK_get_selected_anonymity_level
       (builder, "main_window_search_anonymity_combobox", &anonymity_level))
   {
@@ -71,42 +95,9 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
     g_object_unref (G_OBJECT (builder));  
     return;
   }
-  uri = GNUNET_FS_uri_parse (uris, &perr);
-  g_free (uris);
-  if (uri == NULL)
-  {
-    /* 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))
-  {
-    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))
-  {
-    struct DownloadEntry *de;
-
-    de = GNUNET_malloc (sizeof (struct DownloadEntry));
-    de->uri = uri;
-    de->anonymity = anonymity_level;
-    GNUNET_FS_GTK_open_download_as_dialog (de);
-    gtk_widget_destroy (dialog);
-    g_object_unref (G_OBJECT (builder));  
-    return;
-  }
-  GNUNET_break (0);
-  GNUNET_FS_uri_destroy (uri);
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_FS_GTK_handle_uri_string (uris, anonymity_level));
+  g_free (uris); 
   gtk_widget_destroy (dialog);
   g_object_unref (G_OBJECT (builder));  
 }