1 files changed, 10 insertions, 10 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 74437215..dbcdaa76 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -48,8 +48,6 @@ static char *zone_as_string;
  */
 static char *zonekey_directory;
 
-static GtkWidget *main_window;
-
 /**
  * Get cfg.
  */
@@ -77,11 +75,12 @@ void pseu_change_cont (void *cls,
                  int32_t success,
                  const char *emsg)
 {
+  struct GNUNET_GNS_Context *gns = cls;
   GtkWidget *dialog;
   if (GNUNET_SYSERR == success)
   {
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("New Pseudonym could not be set: `%s'\n"), emsg);
-  dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
+  dialog = gtk_message_dialog_new (GTK_WINDOW (gns->main_window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_ERROR,
                                    GTK_BUTTONS_CLOSE,
@@ -189,7 +188,7 @@ GNUNET_GNS_GTK_autoshort_imagemenuitem_toggled_cb (GtkCheckMenuItem *checkmenuit
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_write(cfg, cfgfile))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Changes to autoshorten could not be written to configuration file: `%s'\n"), cfgfile);
-    dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
+    dialog = gtk_message_dialog_new (GTK_WINDOW (gns->main_window),
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_CLOSE,
@@ -369,11 +368,13 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
   char *label;
   char *keyfile;
 
+  gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context));
+
   if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
   {
    char * message = _("Namestore service is not running!\n");
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, message);
-   dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
+   dialog = gtk_message_dialog_new (GTK_WINDOW (gns->main_window),
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                     GTK_MESSAGE_ERROR,
                                     GTK_BUTTONS_CLOSE,
@@ -386,7 +387,6 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
   }
 
   /* setup crypto keys */
-  gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context));
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
                                                             "gns",
                                                             "ZONEKEY",
@@ -431,6 +431,7 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
     return;
   }
   gns->builder = GNUNET_GTK_main_loop_get_builder(ml);
+  gns->main_window = GTK_WIDGET (get_object ("GNUNET_GNS_GTK_main_window"));
   gns->ts  = GTK_TREE_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_treestore"));
   gns->ls =  GTK_LIST_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_type_liststore"));
   gns->shorten_menu =  GTK_CHECK_MENU_ITEM(gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_autoshort_imagemenuitem"));
@@ -451,16 +452,15 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
   /* setup main window */
-  main_window = GTK_WIDGET (get_object ("GNUNET_GNS_GTK_main_window"));
-  GNUNET_GTK_tray_icon_create (GTK_WINDOW (main_window),
+  GNUNET_GTK_tray_icon_create (GTK_WINDOW (gns->main_window),
                               "gnunet-gtk" /* FIXME: different icon? */ ,
                               "gnunet-gns-gtk");
 
   /* make GUI visible */
   if (!tray_only)
   {
-   gtk_widget_show (main_window);
-   gtk_window_present (GTK_WINDOW (main_window));
+   gtk_widget_show (gns->main_window);
+   gtk_window_present (GTK_WINDOW (gns->main_window));
   }
 }