aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-03-02 11:45:09 +0000
committerChristian Grothoff <christian@grothoff.org>2012-03-02 11:45:09 +0000
commit28dd0a302e4c8d42dcf2b6f9d1c0053fb7e9d79f (patch)
tree4fb7a4b88d9f43e2895f53a1e446d8a389c9ceb8
parentcc716de722672f4bec70380b7d826c7347636b03 (diff)
downloadgnunet-gtk-28dd0a302e4c8d42dcf2b6f9d1c0053fb7e9d79f.tar.gz
gnunet-gtk-28dd0a302e4c8d42dcf2b6f9d1c0053fb7e9d79f.zip
-LRN: Adapt to new main window building
-rw-r--r--src/peerinfo/gnunet-peerinfo-gtk.c5
-rw-r--r--src/setup/gnunet-setup.c6
-rw-r--r--src/statistics/gnunet-statistics-gtk.c6
3 files changed, 17 insertions, 0 deletions
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index d205ad88..2a633d33 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -373,6 +373,11 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
373 373
374 ml = cls; 374 ml = cls;
375 375
376 if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
377 {
378 return;
379 }
380
376 GNUNET_GTK_set_icon_search_path (); 381 GNUNET_GTK_set_icon_search_path ();
377 GNUNET_GTK_setup_nls (); 382 GNUNET_GTK_setup_nls ();
378 peer2info = GNUNET_CONTAINER_multihashmap_create (256); 383 peer2info = GNUNET_CONTAINER_multihashmap_create (256);
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 2f564667..c1ea2520 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -324,6 +324,12 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
324 GtkWidget *main_window; 324 GtkWidget *main_window;
325 325
326 ml = cls; 326 ml = cls;
327
328 if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
329 {
330 return;
331 }
332
327 cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml); 333 cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml);
328 cfg = GNUNET_CONFIGURATION_create (); 334 cfg = GNUNET_CONFIGURATION_create ();
329 (void) GNUNET_CONFIGURATION_load (cfg, cfgName); 335 (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index 3055c4aa..eee75c5a 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -241,6 +241,12 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
241 GtkWidget *main_window; 241 GtkWidget *main_window;
242 242
243 ml = cls; 243 ml = cls;
244
245 if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
246 {
247 return;
248 }
249
244 statistics = 250 statistics =
245 GNUNET_STATISTICS_create ("gnunet-statistics-gtk", 251 GNUNET_STATISTICS_create ("gnunet-statistics-gtk",
246 GNUNET_GTK_main_loop_get_configuration (ml)); 252 GNUNET_GTK_main_loop_get_configuration (ml));