11 files changed, 182 insertions, 43 deletions

diff --git a/configure.ac b/configure.ac
index c9b250ef..ad9c6d7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -474,6 +474,8 @@ AC_CHECK_LIB(gladeui-1,glade_xml_node_new, [],
             )
 LIBS=$SAVELIBS
 
+AC_CHECK_HEADERS([gtk/gtkx.h])
+
 AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data])
 
 # Set PACKAGE_SOURCE_DIR in gnunet_gtk_config.h.
diff --git a/contrib/gnunet_gtk.glade b/contrib/gnunet_gtk.glade
index 9ebb4894..841fb224 100644
--- a/contrib/gnunet_gtk.glade
+++ b/contrib/gnunet_gtk.glade
@@ -8,12 +8,12 @@
     <property name="title" translatable="yes">gnunet-gtk</property>
     <signal name="delete-event" handler="gnunet_gtk_quit_cb" swapped="no"/>
     <child>
-      <object class="GtkNotebook" id="notebook1">
+      <object class="GtkNotebook" id="gnunt_gtk_notebook">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkHBox" id="gnunet_statistics_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
@@ -23,30 +23,32 @@
           </object>
         </child>
         <child type="tab">
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="gnunet_statistics_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">page 1</property>
+            <property name="label" translatable="yes">Statistics</property>
           </object>
           <packing>
             <property name="tab_fill">False</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFontButton" id="fontbutton1">
+          <object class="GtkHBox" id="gnunet_peerinfo_hbox">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkLabel" id="label2">
+          <object class="GtkLabel" id="gnunet_peerinfo_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">page 2</property>
+            <property name="label" translatable="yes">Peers</property>
           </object>
           <packing>
             <property name="position">1</property>
@@ -54,26 +56,96 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image1">
+          <object class="GtkHBox" id="gnunet_namestore_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-missing-image</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkLabel" id="label3">
+          <object class="GtkLabel" id="gnunet_namestore_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">page 3</property>
+            <property name="label" translatable="yes">Zone Editor</property>
           </object>
           <packing>
             <property name="position">2</property>
             <property name="tab_fill">False</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkHBox" id="gnunet_fs_hbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="gnunet_fs_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">File Sharing</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="gnunet_identity_hbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="gnunet_identity_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Egos</property>
+          </object>
+          <packing>
+            <property name="position">4</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="gnunet_setup_hbox">
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="gnunet_setup_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Setup</property>
+          </object>
+          <packing>
+            <property name="position">5</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 425e1e4d..5f9c4bbc 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -681,6 +681,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   main_context.cfg = GNUNET_GTK_main_loop_get_configuration (ml);
   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.main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",
+                                                 main_context.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"));
diff --git a/src/identity/gnunet-identity-gtk.c b/src/identity/gnunet-identity-gtk.c
index 3c262784..a5607a71 100644
--- a/src/identity/gnunet-identity-gtk.c
+++ b/src/identity/gnunet-identity-gtk.c
@@ -511,6 +511,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_GTK_setup_nls ();
   /* setup main window */
   main_window = GTK_WIDGET (get_object ("GNUNET_GTK_identity_window"));
+  main_window = GNUNET_GTK_plug_me ("GNUNET_IDENTITY_GTK_PLUG",
+                                    main_window);
   ls = GTK_LIST_STORE (get_object ("GNUNET_GTK_identity_liststore"));
   GNUNET_assert (NULL != ls);
   gtk_list_store_insert_with_values (ls,
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index 730aacd0..523524d6 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -57,6 +57,18 @@ struct GNUNET_GTK_MainLoop;
 /* ****************** Initialization *************** */
 
 /**
+ * If desired, enable plugging of this main window in the meta window.
+ *
+ * @param env_name environment variable to check
+ * @param main_window main window to plug
+ * @return new main window to initialize
+ */
+GtkWidget *
+GNUNET_GTK_plug_me (const char *env_name,
+                    GtkWidget *main_window);
+
+
+/**
  * Initialize natural language support.
  */
 void
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index b7d5869e..aabcfa63 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -24,7 +24,9 @@
  * @author Christian Grothoff
  */
 #include "gnunet_gtk.h"
-
+#if HAVE_GTK_GTKX_H
+#include <gtk/gtkx.h>
+#endif
 
 /**
  * Initial size of our poll array cache.
@@ -168,6 +170,45 @@ struct GNUNET_GTK_MainLoop
 };
 
 
+/**
+ * If desired, enable plugging of this main window in the meta window.
+ *
+ * @param env_name environment variable to check
+ * @param main_window main window to plug
+ * @return new main window to initialize
+ */
+GtkWidget *
+GNUNET_GTK_plug_me (const char *env_name,
+                    GtkWidget *main_window)
+{
+#if HAVE_GTK_GTKX_H
+  const char *plugid;
+  GtkWidget *plug;
+  GtkWidget *child;
+  unsigned long long id;
+
+  if (NULL == (plugid = getenv (env_name)))
+    return main_window; /* no plugging */
+  if (1 != sscanf (plugid,
+                   "%llu",
+                   &id))
+  {
+    fprintf (stderr,
+             _("Invalid plug name `%s'\n"),
+             plugid);
+    return main_window;
+  }
+  plug = gtk_plug_new ((Window) id);
+  child = gtk_bin_get_child (GTK_BIN (main_window));
+  gtk_widget_reparent (child,
+                       plug);
+  gtk_widget_destroy (main_window);
+  return plug;
+#else
+  return main_window;
+#endif
+}
+
 
 /**
  * Get the configuration.
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
index af4e092c..04df096f 100644
--- a/src/main/gnunet-gtk.c
+++ b/src/main/gnunet-gtk.c
@@ -24,7 +24,9 @@
  * @brief Gtk user interface for GNUnet
  */
 #include "gnunet_gtk.h"
+#if HAVE_GTK_GTKX_H
 #include <gtk/gtkx.h>
+#endif
 
 /**
  * Main loop handle.
@@ -87,6 +89,7 @@ gnunet_gtk_quit_cb (GObject * object,
 }
 
 
+#if HAVE_GTK_GTKX_H
 /**
  * Handle for a plugged in process.
  */
@@ -218,6 +221,7 @@ plug (const char *container,
   start_process (p);
   gtk_widget_show (p->s);
 }
+#endif
 
 
 /**
@@ -239,9 +243,26 @@ run (void *cls,
   main_window = GTK_WIDGET (get_object ("gnunet_gtk_window"));
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleanup_task, NULL);
-  plug ("hbox1",
+#if HAVE_GTK_GTKX_H
+  plug ("gnunet_statistics_hbox",
         "gnunet-statistics-gtk",
         "GNUNET_STATISTICS_GTK_PLUG");
+  plug ("gnunet_peerinfo_hbox",
+        "gnunet-peerinfo-gtk",
+        "GNUNET_PEERINFO_GTK_PLUG");
+  plug ("gnunet_namestore_hbox",
+        "gnunet-namestore-gtk",
+        "GNUNET_NAMESTORE_GTK_PLUG");
+  plug ("gnunet_fs_hbox",
+        "gnunet-fs-gtk",
+        "GNUNET_FS_GTK_PLUG");
+  plug ("gnunet_identity_hbox",
+        "gnunet-identity-gtk",
+        "GNUNET_IDENTITY_GTK_PLUG");
+  plug ("gnunet_setup_hbox",
+        "gnunet-setup",
+        "GNUNET_SETUP_PLUG");
+#endif
   gtk_widget_show (main_window);
   gtk_window_present (GTK_WINDOW (main_window));
 }
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index fe03b6b7..84c0f10e 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -375,6 +375,11 @@ static struct GNUNET_IDENTITY_Handle *identity;
 static struct GNUNET_GTK_MainLoop *ml;
 
 /**
+ * Main window.
+ */
+static GtkWidget *main_window;
+
+/**
  * Our configuration.
  */
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -670,7 +675,6 @@ operation_done_cont (void *cls,
 {
   struct OperationContext *oc = cls;
   GtkWidget *dialog;
-  GtkWindow *main_window;
 
   oc->qe = NULL;
   GNUNET_CONTAINER_DLL_remove (oc_head,
@@ -678,9 +682,8 @@ operation_done_cont (void *cls,
                                oc);
   if (GNUNET_SYSERR == success)
   {
-    main_window = GTK_WINDOW (get_object ("gnunet_namestore_gtk_dialog"));
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Operation failed: `%s'\n"), emsg);
-    dialog = gtk_message_dialog_new (main_window,
+    dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_CLOSE,
@@ -758,12 +761,10 @@ static void
 show_error_message (const char *title,
                     const char *emsg)
 {
-  GtkWindow *main_window;
   GtkDialog *dialog;
 
   /* TODO: consider replacing with widget in the main window */
-  main_window = GTK_WINDOW (get_object ("gnunet_namestore_gtk_dialog"));
-  dialog = GTK_DIALOG(gtk_message_dialog_new (main_window,
+  dialog = GTK_DIALOG(gtk_message_dialog_new (GTK_WINDOW (main_window),
                                               GTK_DIALOG_DESTROY_WITH_PARENT,
                                               GTK_MESSAGE_ERROR,
                                               GTK_BUTTONS_CLOSE,
@@ -2225,7 +2226,6 @@ static void
 run (void *cls,
      const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GtkWidget *main_window;
   gchar *label;
   GtkLabel *status_label;
 
@@ -2235,6 +2235,8 @@ run (void *cls,
     return;
 
   main_window = GTK_WIDGET (get_object ("gnunet_namestore_gtk_dialog"));
+  main_window = GNUNET_GTK_plug_me ("GNUNET_NAMESTORE_GTK_PLUG",
+                                    main_window);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleanup_task, NULL);
 
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index 3971bee9..9683c123 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -664,6 +664,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ats = GNUNET_ATS_performance_init (get_configuration (), &status_cb, NULL);
   /* setup main window */
   main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window"));
+  main_window = GNUNET_GTK_plug_me ("GNUNET_PEERINFO_GTK_PLUG",
+                                    main_window);
   ls = GTK_LIST_STORE (get_object ("GNUNET_PEERINFO_GTK_list_store"));
   GNUNET_assert (NULL != ls);
   gtk_window_maximize (GTK_WINDOW (main_window));
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index a7a306d8..ba82800e 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -641,6 +641,8 @@ run (void *cls,
     (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
   }
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
+  main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",
+                                    main_window);
   GNUNET_CLIENT_service_test ("resolver",
                               cfg,
                               GNUNET_CONSTANTS_SERVICE_TIMEOUT,
diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index cac4452f..4c9426a6 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -30,8 +30,6 @@
 #include <cairo.h>
 #include "gtk_statistics.h"
 
-#include <gtk/gtkx.h>
-
 #define MAX_HISTORY 1280
 
 
@@ -241,7 +239,6 @@ static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GtkWidget *main_window;
-  char *plugid;
 
   ml = cls;
 
@@ -264,24 +261,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   /* setup main window */
   main_window = GTK_WIDGET (get_object ("GNUNET_STATISTICS_GTK_main_window"));
-  if (NULL != (plugid = getenv ("GNUNET_STATISTICS_GTK_PLUG")))
-  {
-    GtkWidget *plug;
-    GtkWidget *child;
-    unsigned long long id;
-
-    if (1 == sscanf (plugid,
-                     "%llu",
-                     &id))
-    {
-      plug = gtk_plug_new ((Window) id);
-      child = gtk_bin_get_child (GTK_BIN (main_window));
-      gtk_widget_reparent (child,
-                           plug);
-      gtk_widget_destroy (main_window);
-      main_window = plug;
-    }
-  }
+  main_window = GNUNET_GTK_plug_me ("GNUNET_STATISTICS_GTK_PLUG",
+                                    main_window);
   gtk_window_maximize (GTK_WINDOW (main_window));
   GNUNET_GTK_tray_icon_create (ml,
                                GTK_WINDOW (main_window),