1 files changed, 33 insertions, 1 deletions

diff --git a/src/common/logging.c b/src/common/logging.c
index d49298fd..aad69f96 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -30,6 +30,28 @@
 #include <glib.h>
 #include <gmodule.h>
 
+static GtkWidget * infoWindow;
+
+static GtkWidget * infoWindowTextView;
+
+static GladeXML * statusXML;
+
+static void init() {
+  if (statusXML != NULL) 
+    return;
+  statusXML
+    = glade_xml_new(getGladeFileName(),
+                    "statusWindow",
+                    PACKAGE_NAME);
+  infoWindow
+    = glade_xml_get_widget(statusXML,
+                           "statusWindow");
+  infoWindowTextView
+    = glade_xml_get_widget(statusXML,
+                           "messageWindowTextView");
+  connectGladeWithPlugins(statusXML);
+}
+
 /**
  * Closure for doInfoMessage.
  */
@@ -46,6 +68,7 @@ static void * doInfoMessage(void * args) {
   GtkTextIter iter;
   GtkTextBuffer * buffer;
 
+  init();
   if (info->doPopup==YES)
     gtk_widget_show(infoWindow);
   buffer
@@ -83,9 +106,10 @@ static void * saveAddLogEntry(void * args) {
   static int once = 1;
   static guint id;
 
+  init();
   if (once) {
     once = 0;
-    s = glade_xml_get_widget(mainXML,
+    s = glade_xml_get_widget(getMainXML(),
                              "statusbar");
     id = gtk_statusbar_get_context_id(GTK_STATUSBAR(s),
                                       "LOG");
@@ -118,3 +142,11 @@ void addLogEntry(const char * txt,
   g_free(note);
 }
 
+void __attribute__ ((destructor)) gnunet_crypto_ltdl_fini() {
+  if (statusXML != NULL) {
+    gtk_widget_destroy(infoWindow);
+    infoWindow = NULL;
+    UNREF(statusXML);
+    statusXML = NULL;
+  }
+}