[GNUnet-SVN] r1864 - GNUnet/src/applications/fs/ecrs gnunet-gtk gnunet-gtk/src/common gnunet-gtk/src/core gnunet-gtk/src/include

[grothoff]

Author: grothoff
Date: 2005-08-23 00:38:56 -0700 (Tue, 23 Aug 2005)
New Revision: 1864

Modified:
   GNUnet/src/applications/fs/ecrs/check.conf
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/core/main.c
   gnunet-gtk/src/include/gnunetgtk_common.h
Log:
fix

Modified: GNUnet/src/applications/fs/ecrs/check.conf
===================================================================
--- GNUnet/src/applications/fs/ecrs/check.conf  2005-08-23 07:36:27 UTC (rev 
1863)
+++ GNUnet/src/applications/fs/ecrs/check.conf  2005-08-23 07:38:56 UTC (rev 
1864)
@@ -20,7 +20,7 @@
 topology = "topology_default"
 
 [NETWORK]
-PORT = 42207
+PORT = 2087
 INTERFACE = eth0
 HELOEXCHANGE = NO
 TRUSTED = 127.0.0.0/8;

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2005-08-23 07:36:27 UTC (rev 1863)
+++ gnunet-gtk/gnunet-gtk.glade 2005-08-23 07:38:56 UTC (rev 1864)
@@ -20,7 +20,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
-  <signal name="delete_event" handler="gtk_main_quit" after="yes"/>
+  <signal name="delete_event" handler="gnunet_gtk_main_quit" after="yes" 
last_modification_time="Tue, 23 Aug 2005 07:30:53 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox1">

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2005-08-23 07:36:27 UTC (rev 1863)
+++ gnunet-gtk/src/common/helper.c      2005-08-23 07:38:56 UTC (rev 1864)
@@ -67,7 +67,9 @@
 
 static Plugin * plugin;
 
+static void * shutdown_function;
 
+
 static gboolean saveCallWrapper(gpointer data) {
   SaveCall * call = data;
   int i;
@@ -274,6 +276,9 @@
       break;
     plug = plug->next;
   }
+  if (0 == strcmp(handler_name,
+                 "gnunet_gtk_main_quit"))
+    method = shutdown_function;
   if (method == NULL) {
     LOG(LOG_DEBUG,
        _("Failed to find handler for `%s'\n"),
@@ -364,9 +369,10 @@
   FREE(plug);
 }
 
-void initGNUnetGTKCommon() {
+void initGNUnetGTKCommon(void * callback) {
   char * load;
 
+  shutdown_function = callback;
   MUTEX_CREATE_RECURSIVE(&sclock);
   PTHREAD_GET_SELF(&mainThread);
   saveCallsUp = YES;

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2005-08-23 07:36:27 UTC (rev 1863)
+++ gnunet-gtk/src/core/main.c  2005-08-23 07:38:56 UTC (rev 1864)
@@ -94,6 +94,13 @@
   return NULL;
 }
 
+static void gnunet_gtk_main_quit() {
+  setCustomLogProc(NULL);
+  run_with_save_calls(&shutdownCode,
+                     NULL);
+  gtk_main_quit();
+}
+
 int main(int argc, 
         char *argv[]) {
   GtkWidget * root;
@@ -116,7 +123,7 @@
   bind_textdomain_codeset("gnunet-gtk", "UTF-8");
 #endif
   startCron();
-  initGNUnetGTKCommon();
+  initGNUnetGTKCommon(&gnunet_gtk_main_quit);
   root
     = glade_xml_get_widget(getMainXML(),
                           "mainWindow");
@@ -127,9 +134,6 @@
   gdk_threads_enter();    
   gtk_main();
   gdk_threads_leave();
-  setCustomLogProc(NULL);
-  run_with_save_calls(&shutdownCode,
-                     NULL);
   doneGNUnetGTKCommon();
   doneUtil();
   

Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h   2005-08-23 07:36:27 UTC (rev 
1863)
+++ gnunet-gtk/src/include/gnunetgtk_common.h   2005-08-23 07:38:56 UTC (rev 
1864)
@@ -27,7 +27,7 @@
 #ifndef GTKUI_HELPER_H
 #define GTKUI_HELPER_H
 
-void initGNUnetGTKCommon(void);
+void initGNUnetGTKCommon(void * callback);
 
 void shutdownPlugins(void);