1 files changed, 9 insertions, 14 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c b/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c
index bf3421ee..f209415d 100644
--- a/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c
+++ b/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c
@@ -64,7 +64,7 @@ void
 GNUNET_GTK_FS_metadata_copy_selection_activated (GtkMenuItem * menuitem, 
                                                  gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
   GtkTreeView *tree;
   GtkClipboard *cb;
   GList *pairs;
@@ -75,9 +75,7 @@ GNUNET_GTK_FS_metadata_copy_selection_activated (GtkMenuItem * menuitem,
   gchar *s;
   gchar *p;
 
-  tree =
-      GTK_TREE_VIEW (gtk_builder_get_object
-                     (builder, "GNUNET_GTK_main_window_metadata_treeview"));
+  tree = main_ctx->md_treeview;
   pairs = NULL;
   gtk_tree_selection_selected_foreach (gtk_tree_view_get_selection (tree),
                                        &copy_metadata_to_clipboard, &pairs);
@@ -129,17 +127,18 @@ GNUNET_GTK_FS_metadata_copy_selection_activated (GtkMenuItem * menuitem,
  *
  * @param button which button caused the event (0 for none)
  * @param event_time time of the event (current time or 'event->time')
- * @param user_data the gtk builder of the main window
+ * @param user_data the context of the main window
  */
 static void
 do_metadata_popup_menu (int button,
                         int event_time,
-                        GtkBuilder *builder)
+                        gpointer user_data)
 {
   GtkMenu *menu;
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
 
-  menu = GTK_MENU (gtk_builder_get_object (builder, "metadata_popup_menu"));
-  gtk_menu_popup (menu, NULL, NULL, NULL, builder, button, event_time);
+  menu = GTK_MENU (gtk_builder_get_object (main_ctx->builder, "metadata_popup_menu"));
+  gtk_menu_popup (menu, NULL, NULL, NULL, main_ctx, button, event_time);
 }
 
 
@@ -158,14 +157,12 @@ GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb (GtkWidget *
                                                                 gpointer
                                                                 user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
-
   /* Ignore double-clicks and triple-clicks */
   if ( (event->button != 3) || (event->type != GDK_BUTTON_PRESS) )
     return FALSE;
   do_metadata_popup_menu (event->button,
                           event->time,
-                          builder);
+                          user_data);
   return TRUE;
 }
 
@@ -182,11 +179,9 @@ gboolean
 GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb (GtkWidget * widget,
                                                         gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
-
   do_metadata_popup_menu (0 /* no button */,
                           gtk_get_current_event_time (),
-                          builder);
+                          user_data);
   return TRUE;
 }