1 files changed, 15 insertions, 12 deletions

diff --git a/src/gnunet-gtk.c b/src/gnunet-gtk.c
index d66107dc..fc5916f0 100644
--- a/src/gnunet-gtk.c
+++ b/src/gnunet-gtk.c
@@ -87,10 +87,6 @@ struct MainContext
    */
   GPollFD *cached_poll_array;
 
-  /**
-   * The main window.
-   */
-  GtkWidget *main_window;
 
   /**
    * Read set.
@@ -175,6 +171,8 @@ free_context (struct MainContext *context)
   g_free (context->cached_poll_array);
   GNUNET_NETWORK_fdset_destroy (context->rs);
   GNUNET_NETWORK_fdset_destroy (context->ws);
+  gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (context->builder, 
+                                                          "GNUNET_GTK_main_window")));
   g_object_unref (G_OBJECT (context->builder));
   g_main_loop_unref (context->gml);
   GNUNET_free (context);
@@ -408,10 +406,14 @@ static void
 tray_icon_on_click(GtkStatusIcon *status_icon, 
                    gpointer user_data)
 {
-  if (gtk_window_is_active (GTK_WINDOW (mc->main_window)))
-    gtk_widget_hide (mc->main_window);
+  GtkWindow *main_window;
+
+  main_window = GTK_WINDOW (gtk_builder_get_object (mc->builder, 
+                                                    "GNUNET_GTK_main_window"));
+  if (gtk_window_is_active (main_window))
+    gtk_widget_hide (GTK_WIDGET (main_window));
   else
-    gtk_window_present (GTK_WINDOW (mc->main_window));
+    gtk_window_present (main_window);
 }
 
 
@@ -540,6 +542,7 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int argc;
+  GtkWidget *main_window;
  
   /* command-line processing */
   argc = 0;
@@ -563,9 +566,9 @@ run (void *cls,
   tray_icon = create_tray_icon();
 
   /* setup main window */
-  mc->main_window = GTK_WIDGET (gtk_builder_get_object (mc->builder, 
-                                                        "GNUNET_GTK_main_window"));
-  gtk_window_maximize (GTK_WINDOW (mc->main_window));
+  main_window = GTK_WIDGET (gtk_builder_get_object (mc->builder, 
+                                                    "GNUNET_GTK_main_window"));
+  gtk_window_maximize (GTK_WINDOW (main_window));
 
   /* initialize file-sharing */
   mc->plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY);
@@ -610,8 +613,8 @@ run (void *cls,
   /* make GUI visible */
   if (!tray_only)
     {
-      gtk_widget_show (mc->main_window);
-      gtk_window_present (GTK_WINDOW (mc->main_window));
+      gtk_widget_show (main_window);
+      gtk_window_present (GTK_WINDOW (main_window));
     }
   /* start the event loop */
   GNUNET_assert (TRUE == g_main_context_acquire (mc->gmc));