5 files changed, 153 insertions, 14 deletions

diff --git a/src/download.c b/src/download.c
index a260783d..73a3146c 100644
--- a/src/download.c
+++ b/src/download.c
@@ -88,15 +88,31 @@ GNUNET_GTK_open_download_as_dialog (struct DownloadContext *dc)
   len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
   gtk_widget_destroy (ad);
   g_object_unref (G_OBJECT (builder));
-  GNUNET_FS_download_start_from_search (fs,
-                                        dc->sr,
-                                        dc->filename,
-                                        NULL /* tempname */,
-                                        0 /* offset */,
-                                        len,
-                                        anonymity,
-                                        opt,
-                                        dc);
+  if (dc->sr != NULL)
+    GNUNET_break (NULL !=
+                  GNUNET_FS_download_start_from_search (fs,
+                                                        dc->sr,
+                                                        dc->filename,
+                                                        NULL /* tempname */,
+                                                        0 /* offset */,
+                                                        len,
+                                                        anonymity,
+                                                        opt,
+                                                        dc));
+  else
+    GNUNET_break (NULL !=
+                  GNUNET_FS_download_start (fs,
+                                            dc->uri,
+                                            NULL,
+                                            dc->filename,
+                                            NULL /* tempname */,
+                                            0 /* offset */,
+                                            len,
+                                            anonymity,
+                                            opt,
+                                            dc,
+                                            NULL));
+
 }
 
 /* end of download.c */
diff --git a/src/download.h b/src/download.h
index f1878e55..595d5c60 100644
--- a/src/download.h
+++ b/src/download.h
@@ -63,6 +63,10 @@ struct DownloadContext
    */
   int is_recursive;
 
+  /**
+   * Desired (default) anonymity level.
+   */
+  int anonymity;
 };
 
 
diff --git a/src/fs_event_handler.c b/src/fs_event_handler.c
index 9837ec98..b4cc9d13 100644
--- a/src/fs_event_handler.c
+++ b/src/fs_event_handler.c
@@ -259,9 +259,10 @@ setup_download (struct DownloadEntry *pde,
     }
   else
     {
-      /* find or create tab with just download results and
+      /* FIXME: find or create tab with just download results and
          create new entry! */
       GNUNET_break (0);
+      return de;
     }
   path = gtk_tree_row_reference_get_path (de->rr);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), 
@@ -318,6 +319,7 @@ start_download (GtkTreeView *tree_view,
   dlc->filename = GNUNET_FS_meta_data_suggest_filename (meta);
   dlc->rr = gtk_tree_row_reference_new (tm, path);
   dlc->sr = sr->result;
+  dlc->anonymity = 1; /* FIXME: grab from search? */
   GNUNET_GTK_open_download_as_dialog (dlc);
 }
 
@@ -1115,6 +1117,8 @@ GNUNET_GTK_fs_event_handler (void *cls,
                      GNUNET_YES);
       break;
     case GNUNET_FS_STATUS_SEARCH_START: 
+      fprintf (stderr,
+               "Search started!\n");
       if (info->value.search.pctx != NULL)
         {
           GNUNET_break (0); 
diff --git a/src/main_window_file_download.c b/src/main_window_file_download.c
index 0c4aa04b..b38bf513 100644
--- a/src/main_window_file_download.c
+++ b/src/main_window_file_download.c
@@ -23,16 +23,108 @@
  * @author Christian Grothoff
  */
 #include "common.h"
+#include "download.h"
+
+
+static GtkBuilder *builder;
+
+void
+GNUNET_GTK_open_url_dialog_url_entry_changed_cb (GtkEditable *editable,
+                                                 gpointer user_data)
+{
+  struct GNUNET_FS_Uri *uri;
+  char *perr;
+  const char *uris;
+  
+  perr = NULL;
+  uris = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                                "GNUNET_GTK_open_url_dialog_url_entry")));
+  if (uris != NULL)
+    uri = GNUNET_FS_uri_parse (uris, &perr);
+  else
+    uri = NULL;
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder,
+                                                                "GNUNET_GTK_open_url_dialog_execute_button")),
+                            (uri == NULL) ? FALSE : TRUE);
+  if (uri != NULL)
+    GNUNET_FS_uri_destroy (uri);
+  else
+    GNUNET_free_non_null (perr);   
+}
+
 
 /**
- * Thumbnail view is toggled.
+ * User selected "Open URI" in main window.
  */
 void
 GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy, 
                                                     gpointer data)
 {
-  /* not implemented */
+  GtkWidget *ad;
+  const char *uris;
+  uint32_t anonymity;
+  struct GNUNET_FS_Uri *uri;
+  char *perr;
+  struct DownloadContext *dc;
+
+  GNUNET_assert (builder == NULL);
+  builder = GNUNET_GTK_get_new_builder ("open_url_dialog.glade");
+  if (builder == NULL)
+    {
+      GNUNET_break (0);
+      return;
+    }
+  ad = GTK_WIDGET (gtk_builder_get_object (builder,
+                                           "GNUNET_GTK_open_url_dialog"));
+  if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
+    {
+      gtk_widget_destroy (ad);
+      g_object_unref (G_OBJECT (builder));
+      builder = NULL;
+      fprintf (stderr,
+               "Dialog closed!\n");
+      return;
+    }
+  uris = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                                "GNUNET_GTK_open_url_dialog_url_entry")));
+  anonymity = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
+                                                                                  "GNUNET_GTK_open_url_dialog_anonymity_spin_button")));
+  uri = GNUNET_FS_uri_parse (uris, &perr);
+  gtk_widget_destroy (ad);
+  g_object_unref (G_OBJECT (builder));
+  builder = NULL;
+  if (uri == NULL)
+    {
+      GNUNET_free (perr);
+      /* Why was "execute" button sensitive!? */     
+      GNUNET_break (0);
+      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_GTK_get_fs_handle (),
+                                            uri,
+                                            anonymity,
+                                            GNUNET_FS_SEARCH_OPTION_NONE,
+                                            NULL));
+      GNUNET_FS_uri_destroy (uri);
+      return;
+    }
+  if (GNUNET_FS_uri_test_chk (uri) ||
+           GNUNET_FS_uri_test_loc (uri))
+    {
+      dc = GNUNET_malloc (sizeof (struct DownloadContext));
+      dc->uri = uri;
+      dc->anonymity = anonymity;
+      GNUNET_GTK_open_download_as_dialog (dc);
+      return;
+    }
   GNUNET_break (0);
+  GNUNET_FS_uri_destroy (uri);
 }
 
 /* end of main_window_file_download.c */
diff --git a/src/main_window_open_directory.c b/src/main_window_open_directory.c
index 6f1c2df3..cd67adba 100644
--- a/src/main_window_open_directory.c
+++ b/src/main_window_open_directory.c
@@ -25,14 +25,37 @@
 #include "common.h"
 
 /**
- * Thumbnail view is toggled.
+ * User selected "Open directory" in menu.  Display dialog, open
+ * file and then display a new tab with its contents.
  */
 void
 GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy, 
                                                              gpointer data)
 {
-  /* not implemented */
+  GtkWidget *ad;
+  GtkBuilder *builder;
+  char *filename;
+
+  builder = GNUNET_GTK_get_new_builder ("open_directory_dialog.glade");
+  if (builder == NULL)
+    {
+      GNUNET_break (0);
+      return;
+    }
+  ad = GTK_WIDGET (gtk_builder_get_object (builder,
+                                           "GNUNET_GTK_open_directory_dialog"));
+  if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
+    {
+      gtk_widget_destroy (ad);
+      g_object_unref (G_OBJECT (builder));
+      return;
+    }
+  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(ad));
+  gtk_widget_destroy (ad);
+  g_object_unref (G_OBJECT (builder));
+
   GNUNET_break (0);
+  g_free (filename);
 }
 
 /* end of main_window_open_directory.c */