1 files changed, 384 insertions, 79 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 6758db12..7c3d55bf 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -256,6 +256,11 @@ static struct SearchTab *uri_tab;
 static struct PublishTab *publish_tab;
 
 /**
+ * Special tab we use to store publishing operations.
+ */
+static struct SearchTab *current_search_tab = NULL;
+
+/**
  * Animation to display while publishing.
  */
 static struct GNUNET_FS_AnimationContext *animation_publishing;
@@ -296,6 +301,12 @@ static struct GNUNET_FS_AnimationContext *animation_found_sources;
 static struct GNUNET_FS_AnimationContext *animation_error;
 
 
+struct SearchTab *
+GNUNET_FS_GTK_get_current_search_tab ()
+{
+  return current_search_tab;
+}
+
 
 /* ***************** Search event handling ****************** */
 
@@ -323,16 +334,10 @@ load_animation (const char *basename)
 static void
 clear_metadata_display ()
 {
-  GtkImage *image;
-  GtkListStore *ms;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
 
-  image =
-      GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
-                 ("GNUNET_GTK_main_window_preview_image"));
-  gtk_image_clear (image);
-  ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
-                       ("GNUNET_GTK_meta_data_list_store"));
-  gtk_list_store_clear (ms);
+  gtk_image_clear (mctx->preview_image);
+  gtk_list_store_clear (mctx->md_liststore);
 }
 
 
@@ -494,6 +499,205 @@ get_suggested_filename_anonymity (GtkTreeModel *tm,
   return NULL;
 }
 
+/*
+ *
+ * finished_chain - non-NULL for top-level call (for the item we're about to download), NULL otherwise
+ *   function sets it to GNUNET_YES if the item we're about to download was, in fact, already downloaded once, and thus we provide a name for it,
+ *   returning a finished relative filename that might only need .gnd appended to it, nothing else.
+ * root_directory - top-level download directory to use. Set to the directory into which root of the tree (grand-*-parent item) was downloaded.
+ *   If there's no already-downloaded grand-*-parents, set to default download directory (thus it will anways be filled on return).
+ * relative_directory - name of the directory in which we're about to download a file, relative to the root_directory. Whether it includes name of the file itself, depends on finished_chain.
+ * anonymity - anonymity level of one of the *parents. Initialize to -1. If none were downloaded, remains -1.
+ * Returned strings should be freed with GNUNET_free() if not NULL.
+ */
+void
+build_relative_name (GtkTreeModel *tm,
+                                   GtkTreeIter *iter,
+                                   int *finished_chain,
+                                   gchar **root_directory,
+                                   gchar **relative_directory,
+                                   int *anonymity)
+{
+  char *filename;
+  int downloaded_anonymity;
+  char *parent_filename;
+  GtkTreeIter parent;
+
+  gtk_tree_model_get (tm, iter,
+      SEARCH_TAB_MC_DOWNLOADED_FILENAME, &filename, 
+      SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, &downloaded_anonymity, -1);
+
+  if (!gtk_tree_model_iter_parent (tm, &parent, iter))
+  {
+    /* Ok, we're at the top item.
+     * bottom == GNUNET_YES is a corner case when we only have one
+     * item (top and bottom at the same time), and it was already
+     * downloaded once (has SEARCH_TAB_MC_DOWNLOADED_FILENAME set) and
+     * cleaned up afterwards (downloadable again).
+     */
+    if (filename == NULL)
+    {
+      /* Top-level item is not downloaded yet
+       * (i.e. we only have one item, it's toplevel, and we're
+       * about to start downloading it).
+       * Use default download directory.
+       */
+      char buf[FILENAME_MAX];
+      char *tmp;
+      tmp = get_default_download_directory (buf, sizeof (buf));
+      /* If no download directory is known, try working directory */
+      if (NULL == tmp)
+        tmp = g_strdup (getcwd (buf, sizeof (buf)));
+      *root_directory = g_strdup  (tmp);
+    }
+    else
+    {
+      char *dot_gnd;
+      /* Toplevel item is a .gnd file, get its directory,
+       * and use it as download root (for now).
+       */
+      *root_directory = g_path_get_dirname (filename);
+      *relative_directory = g_path_get_basename (filename);
+      dot_gnd = strrchr (*relative_directory, '.');
+      if (NULL != dot_gnd && strcmp (dot_gnd, ".gnd") == 0)
+        *dot_gnd = '\0';
+      if (finished_chain)
+        *finished_chain = GNUNET_YES;
+    }
+  }
+  else
+  {
+    build_relative_name (tm, &parent, NULL, root_directory, relative_directory, anonymity);
+    /* We now know the root directory parent stems from,
+     * and parent's name (without .gnd) relative to the root directory.
+     * Now we need to check that root + reldir = directory
+     * where current item resides (that is, it was not saved in a different directory).
+     */
+    if (NULL != filename)
+    {
+      gchar *our_dirname = g_path_get_dirname (filename);
+      gchar *our_expected_dirname = g_build_filename (*root_directory, *relative_directory, NULL);
+      gchar *bname = g_path_get_basename (filename);
+      int chain_ok;
+      char *dot_gnd;
+#if WINDOWS
+      /* Kind of stricmp() for utf-8 */
+      gchar *tmp = g_utf8_casefold (our_dirname, -1);
+      gchar *tmpd = g_utf8_casefold (our_expected_dirname, -1);
+      chain_ok = 0 == g_utf8_collate (tmp, tmpd);
+      g_free (tmp);
+      g_free (tmpd);
+#else
+      chain_ok = 0 == g_utf8_collate (our_dirname, our_expected_dirname);
+#endif
+      dot_gnd = strrchr (bname, '.');
+      if (NULL != dot_gnd && strcmp (dot_gnd, ".gnd") == 0)
+        *dot_gnd = '\0';
+      if (!chain_ok)
+      {
+        /* User decided to download one of the directories into
+         * a different place - respect that decision, pick that
+         * place as the new root directory, and re-start relative name from here.
+         */
+        g_free (*root_directory);
+        *root_directory = g_strdup (our_dirname);
+        g_free (*relative_directory);
+        *relative_directory = g_strdup (bname);
+      }
+      else
+      {
+        /* Continue the chain from the same root directory */
+        gchar *new_relative_directory = g_build_filename (*relative_directory, bname, NULL);
+        g_free (*relative_directory);
+        *relative_directory = new_relative_directory;
+      }
+      if (finished_chain)
+        *finished_chain = GNUNET_YES;
+      g_free (our_dirname);
+      g_free (our_expected_dirname);
+      g_free (bname);
+    }
+  }
+
+  if ((downloaded_anonymity != -1) && (*anonymity == -1))
+    *anonymity = downloaded_anonymity;
+  g_free (filename);
+}
+
+static char *
+get_suggested_filename_anonymity2 (GtkTreeModel *tm,
+                                   GtkTreeIter *iter, 
+                                   char **download_directory,
+                                   int *anonymity)
+{
+  char *result;
+  char *downloaddir;
+  char *relname;
+  char *filename;
+  char *tmp;
+  int downloaded_anonymity;
+  struct GNUNET_CONTAINER_MetaData *meta;
+  GtkTreeIter parent;
+  char *dot;
+  size_t tmplen;
+  int finished_chain;
+
+  downloaddir = NULL;
+  relname = NULL;
+  finished_chain = GNUNET_NO;
+  build_relative_name (tm, iter, &finished_chain, &downloaddir, &relname, &downloaded_anonymity);
+  
+  gtk_tree_model_get (tm, iter, SEARCH_TAB_MC_METADATA, &meta, -1);
+
+  filename = GNUNET_FS_meta_data_suggest_filename (meta);
+  /* Don't trust metadata */
+  tmp = (char *) GNUNET_STRINGS_get_short_name (filename);
+
+  /* Really don't trust metadata */
+  if (NULL != tmp)
+  {
+    tmplen = strlen (tmp);
+    if ((1 == tmplen && '.' == tmp[0]) || (2 <= tmplen && '.' == tmp[0] && '.' == tmp[1]))
+      tmp = NULL;
+    else if ((1 == tmplen && ('/' == tmp[0] || '\\' == tmp[0])) || 0 == tmplen)
+      tmp = NULL;
+  }
+  if (NULL != tmp)
+  {
+    /* now, if we have a directory, replace trailing '/' with ".gnd" */
+    if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta))
+    {
+      if ((tmp[tmplen-1] == '/') || (tmp[tmplen-1] == '\\'))
+        tmp[tmplen-1] = '\0';
+      if (relname)
+      {
+        if (finished_chain)
+          GNUNET_asprintf (&result, "%s%s", relname, GNUNET_FS_DIRECTORY_EXT);
+        else
+          GNUNET_asprintf (&result, "%s%s%s%s", relname, DIR_SEPARATOR_STR, tmp, GNUNET_FS_DIRECTORY_EXT);
+      }
+      else
+        GNUNET_asprintf (&result, "%s%s", tmp, GNUNET_FS_DIRECTORY_EXT);
+    }
+    else
+    {
+      if (relname)
+      {
+        if (finished_chain)
+          result = GNUNET_strdup (relname);
+        else
+          GNUNET_asprintf (&result, "%s%s%s", relname, DIR_SEPARATOR_STR, tmp);
+      }
+      else
+        result = GNUNET_strdup (tmp);
+    }
+  }
+  *download_directory = GNUNET_strdup (downloaddir);
+  GNUNET_free (filename);
+  g_free (downloaddir);
+  g_free (relname);
+  return result;
+}
 
 /**
  * This function is called when the user double-clicks on a search
@@ -742,6 +946,92 @@ start_download_ctx_menu_helper (struct SearchListPopupContext *spc,
   gtk_tree_path_free (path);
 }
 
+void
+start_download2 ()
+{
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
+  struct SearchTab *st = GNUNET_FS_GTK_get_current_search_tab ();
+  struct GNUNET_CONTAINER_MetaData *meta;
+  GtkTreeView *tv;
+  GtkTreeSelection *sel;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  GtkTreeIter parent_iter;
+  struct SearchResult *sr;
+  struct GNUNET_FS_Uri *uri;
+  GtkTreePath *path;
+  const gchar *filename;
+  gchar *downloaddir;
+  struct DownloadEntry *de;
+  guint anonymity;
+  
+  gboolean recursive;
+
+  tv = GTK_TREE_VIEW (gtk_builder_get_object (st->builder, "_search_result_frame"));
+  sel = gtk_tree_view_get_selection (tv);
+  if (!gtk_tree_selection_get_selected (sel, &model, &iter))
+    return;
+
+  meta = NULL;
+
+  gtk_tree_model_get (model, &iter,
+                      SEARCH_TAB_MC_METADATA, &meta,
+                      SEARCH_TAB_MC_URI, &uri,
+                      SEARCH_TAB_MC_SEARCH_RESULT, &sr,
+                      -1);
+
+  if (!((NULL == sr->download) && (NULL != uri) &&
+      ((GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)))))
+    return;
+
+  path = gtk_tree_model_get_path (model, &iter);
+  recursive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mctx->download_recursive_checkbutton));
+  filename = gtk_entry_get_text (mctx->download_name_entry);
+  downloaddir = gtk_file_chooser_get_filename (mctx->download_location_chooser);
+
+  de = GNUNET_malloc (sizeof (struct DownloadEntry));
+
+  if (gtk_tree_model_iter_parent (model, &parent_iter, &iter))
+  {
+    struct SearchResult *psr = NULL;
+    gtk_tree_model_get (model, &parent_iter,
+                      SEARCH_TAB_MC_SEARCH_RESULT, &psr,
+                      -1);
+    if (psr)
+      de->pde = psr->download;
+  }
+  /* else pde remains zero */
+
+  de->uri = GNUNET_FS_uri_dup (uri);
+  GNUNET_asprintf (&de->filename, "%s%s%s", downloaddir, DIR_SEPARATOR_STR, filename);
+  de->sr = sr;
+  sr->download = de;
+  if (GNUNET_GTK_get_selected_anonymity_combo_level (mctx->download_anonymity_combo, &anonymity))
+    de->anonymity = anonymity;
+  else
+    de->anonymity = 1;
+  de->is_recursive = recursive;
+  de->is_directory = GNUNET_FS_meta_data_test_for_directory (meta);
+
+  GNUNET_FS_GTK_download_context_start_download (de);
+
+  gtk_tree_path_free (path);
+  g_free (downloaddir);
+}
+
+/**
+ * User clicked on "Download!" button at the download options panel.
+ *
+ * @param button the "Download!" button
+ * @param user_data the main window context
+ */
+void
+GNUNET_GTK_search_frame_download_download_button_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  start_download2 ();
+}
+
 
 /**
  * "Download" was selected in the current search context menu.
@@ -1049,7 +1339,7 @@ update_search_label (struct SearchTab *tab)
 static void
 close_search_tab (struct SearchTab *tab)
 {
-  GtkNotebook *notebook;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
   int index;
   int i;
 
@@ -1061,14 +1351,11 @@ close_search_tab (struct SearchTab *tab)
     return;
   }
   clear_metadata_display ();
-  notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
   index = -1;
-  for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
-    if (tab->frame == gtk_notebook_get_nth_page (notebook, i))
+  for (i = gtk_notebook_get_n_pages (mctx->notebook) - 1; i >= 0; i--)
+    if (tab->frame == gtk_notebook_get_nth_page (mctx->notebook, i))
       index = i;
-  gtk_notebook_remove_page (notebook, index);
+  gtk_notebook_remove_page (mctx->notebook, index);
   g_object_unref (tab->builder);
   GNUNET_free (tab->query_txt);
   GNUNET_CONTAINER_DLL_remove (search_tab_head, search_tab_tail, tab);
@@ -1298,6 +1585,9 @@ download_lost_parent (struct DownloadEntry *de)
   {
     GNUNET_break (0);
     gtk_tree_path_free (path);
+    g_free (filename);
+    g_free (downloaded_filename);
+    g_free (status_colour);
     return;
   }
   gtk_tree_path_free (path);
@@ -1447,43 +1737,80 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
                                               gpointer user_data)
 {
   struct SearchTab *tab = user_data;
-  GtkImage *image;
-  GtkListStore *ms;
   GtkTreeSelection *sel;
   GtkTreeModel *model;
   GtkTreeIter iter;
   struct GNUNET_CONTAINER_MetaData *meta;
   GdkPixbuf *pixbuf;
+  struct SearchResult *sr;
+  struct GNUNET_FS_Uri *uri;
+  gchar *filename;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
 
   GNUNET_assert (tab->query_txt != NULL);
-  image =
-      GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
-                 ("GNUNET_GTK_main_window_preview_image"));
-  ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
-                       ("GNUNET_GTK_meta_data_list_store"));
   sel = gtk_tree_view_get_selection (tv);
-  gtk_list_store_clear (ms);
+  gtk_list_store_clear (mctx->md_liststore);
+  sel = gtk_tree_view_get_selection (tv);
   if (! gtk_tree_selection_get_selected (sel, &model, &iter))
   {
     /* nothing selected, clear preview */
-    gtk_image_clear (image);
+    gtk_image_clear (mctx->preview_image);
+    gtk_widget_hide (GTK_WIDGET (mctx->download_panel));
     return;
   }
   meta = NULL;
   pixbuf = NULL;
+
   gtk_tree_model_get (model, &iter,
                       SEARCH_TAB_MC_METADATA, &meta,
                       SEARCH_TAB_MC_PREVIEW, &pixbuf,
+                      SEARCH_TAB_MC_URI, &uri,
+                      SEARCH_TAB_MC_SEARCH_RESULT, &sr,
                       -1);
+
+  if ((NULL == sr->download) && (NULL != uri) &&
+      ((GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))))
+  {
+    char *download_directory;
+    char *filename;
+    int anonymity;
+    int is_directory;
+
+    /* Calculate suggested filename */
+    anonymity = -1;
+    download_directory = NULL;
+    filename = get_suggested_filename_anonymity2 (model, &iter,
+        &download_directory, &anonymity);
+
+    is_directory = GNUNET_FS_meta_data_test_for_directory (meta);
+    gtk_widget_set_sensitive (GTK_WIDGET (mctx->download_recursive_checkbutton), is_directory);
+
+    /* TODO: make this configurable */
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mctx->download_recursive_checkbutton), is_directory);
+
+    /* TODO: make this configurable */
+    GNUNET_GTK_select_anonymity_combo_level (mctx->download_anonymity_combo, anonymity >= 0 ? anonymity : 1);
+
+    gtk_entry_set_text (mctx->download_name_entry, filename != NULL ? filename : NULL);
+    gtk_file_chooser_set_current_folder (mctx->download_location_chooser, download_directory);
+    /*gtk_file_chooser_set_current_name (mctx->download_location_chooser, download_directory);*/
+    
+    gtk_widget_show_all (GTK_WIDGET (mctx->download_panel));
+    GNUNET_free (filename);
+    GNUNET_free (download_directory);
+  }
+  else
+    gtk_widget_hide (GTK_WIDGET (mctx->download_panel));
+
   if (NULL != pixbuf)
   {
-    gtk_image_set_from_pixbuf (image, pixbuf);
+    gtk_image_set_from_pixbuf (mctx->preview_image, pixbuf);
     g_object_unref (G_OBJECT (pixbuf));
   }
   if (NULL != meta)  
     GNUNET_CONTAINER_meta_data_iterate (meta,
                                         &GNUNET_FS_GTK_add_meta_data_to_list_store,
-                                        ms);
+                                        mctx->md_liststore);
 }
 
 
@@ -1492,43 +1819,36 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
  * metadata views.
  *
  * @param dummy widget emitting the event, unused
- * @param data master Gtk builder, unused
+ * @param data main window context
  */
 void
 GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
                                                 gpointer data)
 {
-  GtkNotebook *notebook;
   gint page;
   GtkWidget *w;
   struct SearchTab *tab;
-  GtkImage *image;
-  GtkListStore *ms;
   GtkTreeView *tv;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
 
-  notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
-  page = gtk_notebook_get_current_page (notebook);
-  w = gtk_notebook_get_nth_page (notebook, page);
+  page = gtk_notebook_get_current_page (mctx->notebook);
+  w = gtk_notebook_get_nth_page (mctx->notebook, page);
+  current_search_tab = NULL;
   for (tab = search_tab_head; NULL != tab; tab = tab->next)
   {
     if (tab->frame != w)
       continue;
+    current_search_tab = tab;
     tv = GTK_TREE_VIEW (gtk_builder_get_object
                         (tab->builder, "_search_result_frame"));
     GNUNET_FS_GTK_search_treeview_cursor_changed (tv, tab);
     return;
   }
+  gtk_widget_hide (GTK_WIDGET (mctx->download_panel));
   /* active tab is not a search tab (likely the 'publish' tab), 
      clear meta data and preview widgets */
-  image =
-      GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
-                 ("GNUNET_GTK_main_window_preview_image"));
-  gtk_image_clear (image);
-  ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
-                       ("GNUNET_GTK_meta_data_list_store"));
-  gtk_list_store_clear (ms);
+  gtk_image_clear (mctx->preview_image);
+  gtk_list_store_clear (mctx->md_liststore);
 }
 
 
@@ -1752,9 +2072,9 @@ update_search_result (struct SearchResult *sr,
   char *mime;
   GdkPixbuf *pixbuf;
   guint percent_avail;
-  GtkNotebook *notebook;
   gint page;
   int desc_is_a_dup;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
 
   if (sr == NULL)
   {
@@ -1800,11 +2120,8 @@ update_search_result (struct SearchResult *sr,
   GNUNET_free (desc);
   GNUNET_free_non_null (mime);
 
-  notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
-  page = gtk_notebook_get_current_page (notebook);
-  if (gtk_notebook_get_nth_page (notebook, page) == sr->tab->frame)
+  page = gtk_notebook_get_current_page (mctx->notebook);
+  if (gtk_notebook_get_nth_page (mctx->notebook, page) == sr->tab->frame)
   {
     tv = GTK_TREE_VIEW (gtk_builder_get_object
                         (sr->tab->builder, "_search_result_frame"));
@@ -2006,11 +2323,11 @@ setup_search_tab (struct GNUNET_FS_SearchContext *sc,
                   const struct GNUNET_FS_Uri *query)
 {
   struct SearchTab *tab;
-  GtkNotebook *notebook;
   GtkWindow *sf;
   GtkTreeViewColumn *anim_col;
   GtkTreeView *tv;
   gint pages;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
 
   if (NULL == animation_downloading)
   {
@@ -2081,13 +2398,10 @@ setup_search_tab (struct GNUNET_FS_SearchContext *sc,
   update_search_label (tab);
 
   /* make visible */
-  notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
-  pages = gtk_notebook_get_n_pages (notebook);
-  gtk_notebook_insert_page (notebook, tab->frame, tab->tab_label, pages - 1);
-  gtk_notebook_set_current_page (notebook, pages - 1);
-  gtk_widget_show (GTK_WIDGET (notebook));
+  pages = gtk_notebook_get_n_pages (mctx->notebook);
+  gtk_notebook_insert_page (mctx->notebook, tab->frame, tab->tab_label, pages - 1);
+  gtk_notebook_set_current_page (mctx->notebook, pages - 1);
+  gtk_widget_show (GTK_WIDGET (mctx->notebook));
   return tab;
 }
 
@@ -2149,7 +2463,7 @@ struct SearchResult *
 GNUNET_GTK_add_to_uri_tab (const struct GNUNET_CONTAINER_MetaData *meta,
                            const struct GNUNET_FS_Uri *uri)
 {
-  GtkNotebook *notebook;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
   gint page;
 
   if (NULL == uri_tab)
@@ -2159,13 +2473,10 @@ GNUNET_GTK_add_to_uri_tab (const struct GNUNET_CONTAINER_MetaData *meta,
     gtk_widget_set_visible (uri_tab->pause_button, FALSE);
   }
   /* make 'uri_tab' the current page */
-  notebook =
-    GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                  ("GNUNET_GTK_main_window_notebook"));
-  for (page = 0; page < gtk_notebook_get_n_pages (notebook); page++)
-    if (uri_tab->frame == gtk_notebook_get_nth_page (notebook, page))
+  for (page = 0; page < gtk_notebook_get_n_pages (mctx->notebook); page++)
+    if (uri_tab->frame == gtk_notebook_get_nth_page (mctx->notebook, page))
     {
-      gtk_notebook_set_current_page (notebook, page);
+      gtk_notebook_set_current_page (mctx->notebook, page);
       break;
     }
   return GNUNET_GTK_add_search_result (uri_tab, NULL, uri, meta, NULL, 0);
@@ -2648,7 +2959,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
                       SEARCH_TAB_MC_STATUS_COLOUR, "blue",
                       SEARCH_TAB_MC_SEARCH_RESULT, de->sr, 
                       SEARCH_TAB_MC_COMPLETED, (guint64) completed,
-                      SEARCH_TAB_MC_FILENAME, de->filename,
+                      SEARCH_TAB_MC_DOWNLOADED_FILENAME, de->filename,
                       SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, de->anonymity,
                       SEARCH_TAB_MC_STATUS_ICON,
                       GNUNET_GTK_animation_context_get_pixbuf (animation_download_stalled),
@@ -2797,23 +3108,20 @@ handle_publish_error (struct PublishEntry *pe,
 static void
 delete_publish_tab ()
 {
-  GtkNotebook *notebook;
   struct PublishTab *pt;
   int index;
   int i;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
  
   if (NULL == publish_tab)
     return;
   pt = publish_tab;
   publish_tab = NULL;
-  notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
   index = -1;
-  for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
-    if (pt->frame == gtk_notebook_get_nth_page (notebook, i))
+  for (i = gtk_notebook_get_n_pages (mctx->notebook) - 1; i >= 0; i--)
+    if (pt->frame == gtk_notebook_get_nth_page (mctx->notebook, i))
       index = i;
-  gtk_notebook_remove_page (notebook, index);
+  gtk_notebook_remove_page (mctx->notebook, index);
 
   /* fully destroy tab */
   g_object_unref (pt->builder);
@@ -2912,10 +3220,10 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
   GtkTreePath *path;
   GtkWindow *df;
   GtkWidget *tab_label;
-  GtkNotebook *notebook;
   char *size_fancy;
   GtkTreeView *tv;
   GtkTreeViewColumn *anim_col;
+  struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
   
   if (NULL == publish_tab)
   {
@@ -2948,12 +3256,9 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
                                                                   anim_col);
 
     /* make visible */
-    notebook =
-      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                    ("GNUNET_GTK_main_window_notebook"));
-    gtk_notebook_insert_page (notebook, publish_tab->frame, tab_label, 0);
-    gtk_widget_show (GTK_WIDGET (notebook));
-    gtk_notebook_set_current_page (notebook, 0);
+    gtk_notebook_insert_page (mctx->notebook, publish_tab->frame, tab_label, 0);
+    gtk_widget_show (GTK_WIDGET (mctx->notebook));
+    gtk_notebook_set_current_page (mctx->notebook, 0);
     publish_tab->ts =
       GTK_TREE_STORE (gtk_builder_get_object
                       (publish_tab->builder, "_publish_frame_tree_store"));