1 files changed, 61 insertions, 31 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index ccc05c15..7cee7ac3 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -23,6 +23,7 @@
  * @brief Main function of gnunet-fs-gtk
  * @author Christian Grothoff
  */
+#include "gnunet-fs-gtk.h"
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_event-handler.h"
 #include <gdk/gdkkeysyms.h>
@@ -172,14 +173,14 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 void
 GNUNET_GTK_quit_cb (GObject * object, gpointer user_data)
 {
-  GtkWidget *main_window = GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object (
-      "GNUNET_GTK_main_window"));
+  struct GNUNET_GTK_MainWindowContext *main_context;
 
-  main_window_save_position (main_window);
+  main_window_save_position (main_context->main_window);
 
   GNUNET_GTK_tray_icon_destroy ();
   GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
                                       &shutdown_task, NULL);
+  GNUNET_free (main_context);
 }
 
 
@@ -193,72 +194,97 @@ GNUNET_GTK_quit_cb (GObject * object, gpointer user_data)
 static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GtkWidget *main_window;
-  GtkTreeView *metadata_tree;
   unsigned long long dl_parallel, req_parallel, window_x, window_y,
       window_width, window_height;
   int maximized;
-  const struct GNUNET_CONFIGURATION_Handle *cfg; 
+
+  struct GNUNET_GTK_MainWindowContext *main_context;
+
+  main_context = GNUNET_malloc (sizeof (struct GNUNET_GTK_MainWindowContext));
 
   ml = cls;
 
+  /* setup main context */
+  if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (cls, main_context))
+  {
+    GNUNET_free (main_context);
+    return;
+  }
+
+  main_context->builder = GNUNET_GTK_main_loop_get_builder (cls);
+  main_context->cfg = GNUNET_GTK_main_loop_get_configuration (cls);
+  main_context->search_ns_treestore = GTK_TREE_STORE (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_treestore"));
+  main_context->main_window = GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window"));
+  main_context->ns_selector_treeview = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object ("namespace_selector_treeview"));
+  main_context->ns_selector_window = GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("namespace_selector_window"));
+  main_context->ns_dropdown_button = GTK_TOGGLE_BUTTON (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_dropdown_button"));
+  main_context->search_ns_label = GTK_LABEL (GNUNET_FS_GTK_get_main_window_object ("main_window_search_selected_namespace_label"));
+
+  main_context->search_entry = GTK_ENTRY (GNUNET_FS_GTK_get_main_window_object ("main_window_search_entry"));
+
+  main_context->anonymity_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_search_anonymity_combobox"));
+  main_context->anonymity_level_liststore = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("anonymity_level_liststore"));
+
+  main_context->preview_image = GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window_preview_image"));
+  main_context->md_liststore = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_meta_data_list_store"));
+  main_context->md_treeview = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window_metadata_treeview"));
+  main_context->ns_callback_registered = GNUNET_NO;
+
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
 
-  /* setup main window */
-  main_window =
-      GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object
-                  ("GNUNET_GTK_main_window"));
-
-  cfg = GNUNET_GTK_main_loop_get_configuration (ml);
+  /* Make sure button class is realized */
+  g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
+  /* GNUnet main window assumes that images on buttons are visible,
+   * override the theme's gtkrc setting
+   */
+  g_object_set (gtk_settings_get_default (), "gtk-button-images", TRUE, NULL);
 
-  maximized = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+  /* setup main window */
+  maximized = GNUNET_CONFIGURATION_get_value_yesno (main_context->cfg,
                                                     "gnunet-gtk", "MAIN_WINDOW_MAXIMIZED");
   if (GNUNET_SYSERR == maximized)
     maximized = GNUNET_YES;
   if ( (GNUNET_NO == maximized) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
                                                             "MAIN_WINDOW_X", &window_x)) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
                                                             "MAIN_WINDOW_Y", &window_y)) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
                                                             "MAIN_WINDOW_WIDTH", &window_width)) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
                                                             "MAIN_WINDOW_HEIGHT", &window_height)) )
   {
-    gtk_window_move (GTK_WINDOW (main_window), window_x, window_y);
-    gtk_window_resize (GTK_WINDOW (main_window), window_width, window_height);
+    gtk_window_move (GTK_WINDOW (main_context->main_window), window_x, window_y);
+    gtk_window_resize (GTK_WINDOW (main_context->main_window), window_width, window_height);
   }
   else
   {
     /* If anything is wrong - play safe and show it maximized */
-    gtk_window_maximize (GTK_WINDOW (main_window));
+    gtk_window_maximize (GTK_WINDOW (main_context->main_window));
   }
   
   /* Allow multiple selection in metadata view; */
   /* FIXME-GTK3: this can be done within (modern versions of) glade */
-  metadata_tree =
-      GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
-                     ("GNUNET_GTK_main_window_metadata_treeview"));
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (metadata_tree),
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (main_context->md_treeview),
                                GTK_SELECTION_MULTIPLE);
 
-  GNUNET_GTK_tray_icon_create (GTK_WINDOW (main_window),
+  GNUNET_GTK_tray_icon_create (GTK_WINDOW (main_context->main_window),
                                "gnunet-fs-gtk",
                                "gnunet-fs-gtk");
 
   /* FIXME: should these '1's be here? Maybe better to put them into
    * default config files?
    */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
       "MAX_PARALLEL_DOWNLOADS", &dl_parallel))
     dl_parallel = 1;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
       "MAX_PARALLEL_REQUESTS", &req_parallel))
     req_parallel = 1;
 
   /* initialize file-sharing */
-  fs = GNUNET_FS_start (cfg, "gnunet-fs-gtk",
+  fs = GNUNET_FS_start (main_context->cfg, "gnunet-fs-gtk",
                         &GNUNET_GTK_fs_event_handler, NULL, 
                         GNUNET_FS_FLAGS_NONE | GNUNET_FS_FLAGS_PERSISTENCE 
                                                  /* | GNUNET_FS_FLAGS_DO_PROBES */ ,
@@ -269,14 +295,18 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                         GNUNET_FS_OPTIONS_END);
   if (NULL == fs)
   {
-    GNUNET_GTK_main_loop_quit (ml);
+    GNUNET_GTK_main_loop_quit (cls);
+    GNUNET_free (main_context);
     return;
   }
+
+  GNUNET_GTK_main_window_refresh_ns_list (main_context);
+
   /* make GUI visible */
   if (!tray_only)
   {
-    gtk_widget_show (main_window);
-    gtk_window_present (GTK_WINDOW (main_window));
+    gtk_widget_show (main_context->main_window);
+    gtk_window_present (GTK_WINDOW (main_context->main_window));
   }
 
 }