1 files changed, 8 insertions, 17 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index fdab7b94..ff43ff62 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -34,7 +34,7 @@
  * @param builder the main dialog builder
  */
 static void
-start_search (GtkBuilder *builder)
+start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
 {
   guint anonymity_level;
   gchar *keywords;
@@ -44,7 +44,7 @@ start_search (GtkBuilder *builder)
 
   /* get anonymity level */
   if (!GNUNET_GTK_get_selected_anonymity_level
-      (builder, "main_window_search_anonymity_combobox", &anonymity_level))
+      (main_ctx->builder, "main_window_search_anonymity_combobox", &anonymity_level))
   {
     GNUNET_break (0);
     return;
@@ -73,15 +73,10 @@ start_search (GtkBuilder *builder)
   /* get selected namespace */
   {
     GtkTreeRowReference *ref;
-    GtkToggleButton *toggle_button;
     GtkTreeIter iter;
 
     nsid = NULL;    
-    toggle_button =
-      GTK_TOGGLE_BUTTON (gtk_builder_get_object
-                         (builder,
-                          "main_window_search_namespace_dropdown_button"));
-    ref = g_object_get_data (G_OBJECT (toggle_button), "selected-row-reference");
+    ref = g_object_get_data (G_OBJECT (main_ctx->ns_dropdown_button), "selected-row-reference");
     if (NULL != ref)
     {
       GtkTreePath *namespace_treepath;
@@ -97,12 +92,9 @@ start_search (GtkBuilder *builder)
    
   /* get keywords and compose keyword string */
   {
-    GtkEntry *query_entry;
     const char *entry_keywords;
 
-    query_entry = GTK_ENTRY (gtk_builder_get_object (builder, 
-                                                     "main_window_search_entry"));
-    entry_keywords = gtk_entry_get_text (query_entry);  
+    entry_keywords = gtk_entry_get_text (main_ctx->search_entry);  
     if (NULL != mime_keyword)
     {
       keywords = g_strdup_printf ("%s +%s", 
@@ -156,9 +148,8 @@ void
 main_window_search_button_clicked_cb (GtkButton * button, 
                                       gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
-
-  start_search (builder);
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
+  start_search (main_ctx);
 }
 
 
@@ -176,11 +167,11 @@ main_window_search_entry_key_press_event_cb (GtkWidget * widget,
                                              GdkEventKey * event,
                                              gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
 
   if (event->keyval == GDK_KEY_Return)
   {
-    start_search (builder);
+    start_search (main_ctx);
     return TRUE;
   }
   return FALSE;