-moving globals into struct for the menu shell

1 files changed, 64 insertions, 72 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 09d8b0c5..8bae5f0e 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -110,19 +110,6 @@ static struct SearchTab *uri_tab;
  */
 static struct PublishTab *publish_tab;
 
-/**
- * Row reference for the current search context menu.
- * FIXME-UNCLEAN: de-globalize?
- */
-static GtkTreeRowReference *current_context_row_reference;
-
-/**
- * Search tab used for the current search context menu.
- * FIXME-UNCLEAN: de-globalize?
- */
-static struct SearchTab *current_context_search_tab;
-
-
 
 /* ***************** Search event handling ****************** */
 
@@ -412,19 +399,43 @@ start_download (GtkTreeView *tree_view,
 
 
 /**
+ * Context for the search list popup menu.
+ */
+struct SearchListPopupContext
+{
+  /**
+   * Tab where the search list popup was created.
+   */
+  struct SearchTab *tab;
+                  
+  /**
+   * Row where the search list popup was created.
+   */
+  GtkTreeRowReference *rr;
+
+  /**
+   * Search result at the respective row.
+   */
+  struct SearchResult *sr;
+ 
+};
+
+
+/**
  * An item was selected from the context menu; destroy the menu shell.
  *
  * @param menushell menu to destroy
- * @parma user_data the 'struct DownloadEntry' for the menu (unused)
+ * @param user_data the 'struct SearchListPopupContext' of the menu 
  */
 static void
 search_list_popup_selection_done (GtkMenuShell *menushell,
                                   gpointer user_data)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Item selected in menu shell %p, destroying it.\n",
-              menushell);
+  struct SearchListPopupContext *spc = user_data;
+
   gtk_widget_destroy (GTK_WIDGET (menushell));
+  gtk_tree_row_reference_free (spc->rr);
+  GNUNET_free (spc);
 }
 
 
@@ -453,32 +464,26 @@ GNUNET_FS_GTK_search_treeview_row_activated (GtkTreeView * tree_view,
 /**
  * "Download" was selected in the current search context menu.
  * 
+ * @param spc the 'struct SearchListPopupContext' of the menu 
  * @param is_recursive was this the 'recursive' option?
  * @parma save_as was this the 'save as' option?
  */
 static void
-start_download_ctx_menu_helper (int is_recursive,
+start_download_ctx_menu_helper (struct SearchListPopupContext *spc,
+                                int is_recursive,
                                 int save_as)
 {
   GtkTreePath *path;
   GtkTreeView *tv;
 
-  if (current_context_row_reference == NULL)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  path = gtk_tree_row_reference_get_path (current_context_row_reference);
-  gtk_tree_row_reference_free (current_context_row_reference);
-  current_context_row_reference = NULL;
+  path = gtk_tree_row_reference_get_path (spc->rr);
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (current_context_search_tab->builder,
+                      (spc->tab->builder,
                        "_search_result_frame"));
-  start_download (tv, path, current_context_search_tab,
+  start_download (tv, path, spc->tab,
                   is_recursive,
                   save_as);
   gtk_tree_path_free (path);
-  current_context_search_tab = NULL;
 }
 
 
@@ -486,12 +491,14 @@ start_download_ctx_menu_helper (int is_recursive,
  * "Download" was selected in the current search context menu.
  * 
  * @param item the 'download' menu item
- * @parma user_data FIXME
+ * @param user_data the 'struct SearchListPopupContext' of the menu 
  */
 static void
 start_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
-  start_download_ctx_menu_helper (GNUNET_NO, GNUNET_NO);
+  struct SearchListPopupContext *spc = user_data;
+
+  start_download_ctx_menu_helper (spc, GNUNET_NO, GNUNET_NO);
 }
 
 
@@ -499,12 +506,14 @@ start_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
  * "Download recursively" was selected in the current search context menu.
  * 
  * @param item the 'download recursively' menu item
- * @parma user_data FIXME
+ * @param user_data the 'struct SearchListPopupContext' of the menu 
  */
 static void
 start_download_recursively_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
-  start_download_ctx_menu_helper (GNUNET_YES, GNUNET_NO);
+  struct SearchListPopupContext *spc = user_data;
+
+  start_download_ctx_menu_helper (spc, GNUNET_YES, GNUNET_NO);
 }
 
 
@@ -512,12 +521,14 @@ start_download_recursively_ctx_menu (GtkMenuItem *item, gpointer user_data)
  * "Download as..." was selected in the current search context menu.
  * 
  * @param item the 'download as...' menu item
- * @parma user_data FIXME
+ * @param user_data the 'struct SearchListPopupContext' of the menu 
  */
 static void
 start_download_as_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
-  start_download_ctx_menu_helper (GNUNET_NO, GNUNET_YES);
+  struct SearchListPopupContext *spc = user_data;
+
+  start_download_ctx_menu_helper (spc, GNUNET_NO, GNUNET_YES);
 }
 
 
@@ -525,19 +536,16 @@ start_download_as_ctx_menu (GtkMenuItem *item, gpointer user_data)
  * Download "abort" was selected in the current search context menu.
  * 
  * @param item the 'abort' menu item
- * @parma user_data the 'struct DownloadEntry' to abort.
+ * @parma user_data the 'struct SearchListPopupContext' with the download to abort.
  */
 static void
 abort_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
-  struct DownloadEntry *de = user_data;
+  struct SearchListPopupContext *spc = user_data;
+  struct DownloadEntry *de = spc->sr->download;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Aborting download DE=%p\n", 
-              de);
   GNUNET_assert (de->dc != NULL);
   GNUNET_FS_download_stop (de->dc, GNUNET_YES);
-  current_context_search_tab = NULL;
 }
 
 
@@ -546,10 +554,12 @@ abort_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
  * 
  * @param item the 'copy-to-clipboard' menu item
  * @parma user_data NULL
+ * @parma user_data the 'struct SearchListPopupContext' of the menu
  */
 static void
 copy_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
+  struct SearchListPopupContext *spc = user_data;
   GtkTreePath *path;
   GtkTreeView *tv;
   GtkTreeModel *tm;
@@ -558,16 +568,9 @@ copy_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
   char *uris;
   GtkClipboard *cb;
 
-  if (NULL == current_context_row_reference)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  path = gtk_tree_row_reference_get_path (current_context_row_reference);
-  gtk_tree_row_reference_free (current_context_row_reference);
-  current_context_row_reference = NULL;
+  path = gtk_tree_row_reference_get_path (spc->rr);
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (current_context_search_tab->builder,
+                      (spc->tab->builder,
                        "_search_result_frame"));
   tm = gtk_tree_view_get_model (tv);
   if (! gtk_tree_model_get_iter (tm, &iter, path))
@@ -578,7 +581,6 @@ copy_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
   }
   gtk_tree_model_get (tm, &iter, 1, &uri, -1);
   gtk_tree_path_free (path);
-  current_context_search_tab = NULL;
   if (uri == NULL)
   {
     GNUNET_break (0);
@@ -615,27 +617,17 @@ search_list_popup (GtkTreeModel *tm,
   GtkTreePath *path;
   struct SearchResult *sr;
   struct GNUNET_FS_Uri *uri;
+  struct SearchListPopupContext *spc;
 
   /* FIXME-UNCLEAN: move these to some menu context struct
      (de-globalize) */
-  current_context_search_tab = tab;
-  if (current_context_row_reference != NULL)
-  {
-    gtk_tree_row_reference_free (current_context_row_reference);
-    current_context_row_reference = NULL;
-  }
+  spc = GNUNET_malloc (sizeof (struct SearchListPopupContext));
+  spc->tab = tab;
   path = gtk_tree_model_get_path (tm, iter);
-  current_context_row_reference = gtk_tree_row_reference_new (tm, path);
+  spc->rr = gtk_tree_row_reference_new (tm, path);
   gtk_tree_path_free (path);
-
   gtk_tree_model_get (tm, iter, 1, &uri, 9, &sr, -1);
-  /* FIXME-BUG: 'sr' can be NULL here, somehow some code fails to setup the record.. */
-  if (NULL == sr)
-  {
-    /* FIXME-BUG: this prevents the crash for now, but does not solve the problem */
-    GNUNET_break (0);
-    return FALSE;
-  }
+  spc->sr = sr;
   menu = GTK_MENU (gtk_menu_new ());
   if ( (NULL == sr->download) &&
        (NULL != uri) )
@@ -643,7 +635,7 @@ search_list_popup (GtkTreeModel *tm,
     /* only display download menus if there is a URI */
     child = gtk_menu_item_new_with_label (_("_Download"));
     g_signal_connect (child, "activate",
-                      G_CALLBACK (start_download_ctx_menu), NULL);
+                      G_CALLBACK (start_download_ctx_menu), spc);
     gtk_label_set_use_underline (GTK_LABEL
                                  (gtk_bin_get_child (GTK_BIN (child))),
                                  TRUE);
@@ -652,7 +644,7 @@ search_list_popup (GtkTreeModel *tm,
     
     child = gtk_menu_item_new_with_label (_("Download _recursively"));
     g_signal_connect (child, "activate",
-                      G_CALLBACK (start_download_recursively_ctx_menu), NULL);
+                      G_CALLBACK (start_download_recursively_ctx_menu), spc);
     gtk_label_set_use_underline (GTK_LABEL
                                  (gtk_bin_get_child (GTK_BIN (child))),
                                  TRUE);
@@ -662,7 +654,7 @@ search_list_popup (GtkTreeModel *tm,
 
     child = gtk_menu_item_new_with_label (_("Download _as..."));
     g_signal_connect (child, "activate",
-                      G_CALLBACK (start_download_as_ctx_menu), NULL);
+                      G_CALLBACK (start_download_as_ctx_menu), spc);
     gtk_label_set_use_underline (GTK_LABEL
                                  (gtk_bin_get_child (GTK_BIN (child))),
                                  TRUE);
@@ -674,7 +666,7 @@ search_list_popup (GtkTreeModel *tm,
   {
     child = gtk_menu_item_new_with_label (_("_Abort download"));
     g_signal_connect (child, "activate",
-                      G_CALLBACK (abort_download_ctx_menu), sr->download);
+                      G_CALLBACK (abort_download_ctx_menu), spc);
     gtk_label_set_use_underline (GTK_LABEL
                                  (gtk_bin_get_child (GTK_BIN (child))),
                                  TRUE);
@@ -685,13 +677,13 @@ search_list_popup (GtkTreeModel *tm,
   {
     child = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
     g_signal_connect (child, "activate",
-                      G_CALLBACK (copy_uri_to_clipboard_ctx_menu), NULL);
+                      G_CALLBACK (copy_uri_to_clipboard_ctx_menu), spc);
     gtk_label_set_use_underline (GTK_LABEL
                                  (gtk_bin_get_child (GTK_BIN (child))), TRUE);
     gtk_widget_show (child);
   }
   g_signal_connect (menu, "selection-done",
-                    G_CALLBACK (search_list_popup_selection_done), NULL);
+                    G_CALLBACK (search_list_popup_selection_done), spc);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
   gtk_menu_popup (menu, NULL, NULL, NULL, NULL, init_button, event_time);
   return TRUE;