1 files changed, 48 insertions, 48 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 2f775e86..918611c7 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -193,7 +193,9 @@ GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {  
+  GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
+  ml = NULL;
   if (fs != NULL)
   {
     GNUNET_FS_stop (fs);
@@ -211,14 +213,11 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  */
 void
 GNUNET_FS_GTK_menu_quit_activate_cb (GtkMenuItem *object,
-                                  gpointer user_data)
+                                     gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *main_context = user_data;
 
-  GNUNET_GTK_tray_icon_destroy ();
-  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                      &shutdown_task, NULL);
-  GNUNET_free (main_context);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -368,37 +367,37 @@ unique_app_message_cb (UniqueApp *app,
 static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  unsigned long long dl_parallel, req_parallel, window_x, window_y,
-      window_width, window_height;
+  unsigned long long dl_parallel;
+  unsigned long long req_parallel;
+  unsigned long long window_x;
+  unsigned long long window_y;
+  unsigned long long window_width;
+  unsigned long long window_height;
   int maximized;
-  struct GNUNET_GTK_MainWindowContext *main_context;
+  static 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);
+  if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (cls, &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.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.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.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;
+  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 ();
@@ -411,50 +410,51 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   g_object_set (gtk_settings_get_default (), "gtk-button-images", TRUE, NULL);
 
   /* setup main window */
-  maximized = GNUNET_CONFIGURATION_get_value_yesno (main_context->cfg,
+  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 (main_context->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 (main_context->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 (main_context->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 (main_context->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_context->main_window), window_x, window_y);
-    gtk_window_resize (GTK_WINDOW (main_context->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_context->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 */
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (main_context->md_treeview),
+  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_context->main_window),
+  GNUNET_GTK_tray_icon_create (ml,
+                               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 (main_context->cfg, "gnunet-fs-gtk",
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context.cfg, "gnunet-fs-gtk",
       "MAX_PARALLEL_DOWNLOADS", &dl_parallel))
     dl_parallel = DEFAULT_MAX_PARALLEL_DOWNLOADS;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-fs-gtk",
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context.cfg, "gnunet-fs-gtk",
       "MAX_PARALLEL_REQUESTS", &req_parallel))
     req_parallel = DEFAULT_MAX_PARALLEL_REQUESTS;
 
   /* initialize file-sharing */
-  fs = GNUNET_FS_start (main_context->cfg, "gnunet-fs-gtk",
+  fs = GNUNET_FS_start (main_context.cfg, "gnunet-fs-gtk",
                         &GNUNET_GTK_fs_event_handler, NULL, 
                         GNUNET_FS_FLAGS_PERSISTENCE | GNUNET_FS_FLAGS_DO_PROBES,
                         GNUNET_FS_OPTIONS_DOWNLOAD_PARALLELISM,
@@ -465,23 +465,23 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL == fs)
   {
     GNUNET_GTK_main_loop_quit (cls);
-    GNUNET_free (main_context);
     return;
   }
 
-  GNUNET_GTK_main_window_refresh_ns_list (main_context);
+  GNUNET_GTK_main_window_refresh_ns_list (&main_context);
 #if HAVE_LIBUNIQUE
-  unique_app_watch_window (unique_app, GTK_WINDOW (main_context->main_window));
+  unique_app_watch_window (unique_app, GTK_WINDOW (main_context.main_window));
   g_signal_connect (unique_app, "message-received",
-                    G_CALLBACK (unique_app_message_cb), main_context);
+                    G_CALLBACK (unique_app_message_cb), &main_context);
 #endif
   /* make GUI visible */
   if (!tray_only)
   {
-    gtk_widget_show (main_context->main_window);
-    gtk_window_present (GTK_WINDOW (main_context->main_window));
+    gtk_widget_show (main_context.main_window);
+    gtk_window_present (GTK_WINDOW (main_context.main_window));
   }
-
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &shutdown_task, NULL);
 }