gtk fixes

5 files changed, 41 insertions, 44 deletions

diff --git a/TODO b/TODO
index 06a833ba..3ab1bcf0 100644
--- a/TODO
+++ b/TODO
@@ -8,9 +8,7 @@
 5) why can the "file sharing" tab not be selected first
    (I can select first "General" and then "file sharing"!,
     glade shows no difference between the two!!!)
-6) stats only work if LANG for gnunetd and gnunet-gtk match
-7) gtkSaveCall un-queueing sometimes fails, then
-   gnunet-gtk will not shutdown (why? when?)!
+6) i18n does not work (UTF-8/pango problems)
 
 Later (0.7.1+):
 1) auto-rename downloaded files 
diff --git a/src/common/helper.c b/src/common/helper.c
index 8d597df4..c150b989 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -33,6 +33,7 @@ typedef struct {
   Semaphore * sem;
   void * args;
   SimpleCallback func;
+  int destroyed;
 } SaveCall;
 
 typedef struct Plugin {
@@ -69,9 +70,27 @@ static Plugin * plugin;
 
 static gboolean saveCallWrapper(gpointer data) {
   SaveCall * call = data;
+  int i;
+
+  /* clearly, we are no longer pending,
+     so remove from psc */
+  if (call->sem != NULL) {
+    MUTEX_LOCK(&sclock);
+    for (i=0;i<pscCount;i++) {
+      if (psc[i] == call) {
+        psc[i] = psc[pscCount-1];
+        break;
+      }
+    }
+    GNUNET_ASSERT(i != pscCount);
+    GROW(psc,
+         pscCount,
+         pscCount-1);
+    MUTEX_UNLOCK(&sclock);
+  }
 
   call->func(call->args);
-  if (call->sem != NULL)
+  if (call->sem != NULL) 
     SEMAPHORE_UP(call->sem);
   return FALSE;
 }
@@ -84,7 +103,6 @@ static gboolean saveCallWrapper(gpointer data) {
 void gtkSaveCall(SimpleCallback func, 
                  void * args) {
   SaveCall call;
-  int i;
 
   MUTEX_LOCK(&sclock);
   if ( (saveCallsUp == NO) ||
@@ -92,27 +110,15 @@ void gtkSaveCall(SimpleCallback func,
     call.args = args;
     call.func = func;
     call.sem  = SEMAPHORE_NEW(0);
+    call.destroyed = 0;
     GROW(psc,
          pscCount,
          pscCount+1);
     psc[pscCount-1] = &call;
-    MUTEX_UNLOCK(&sclock);
-    gtk_idle_add(&saveCallWrapper, 
+    gtk_idle_add(&saveCallWrapper,
                  &call);
-    SEMAPHORE_DOWN(call.sem);
-    /* remove from psc list */
-    MUTEX_LOCK(&sclock);
-    for (i=0;i<pscCount;i++) {
-      if (psc[i] == &call) {
-        psc[i] = psc[pscCount-1];
-        break;
-      }
-    }
-    GNUNET_ASSERT(i != pscCount);
-    GROW(psc,
-         pscCount,
-         pscCount-1);
     MUTEX_UNLOCK(&sclock);
+    SEMAPHORE_DOWN(call.sem);
     SEMAPHORE_FREE(call.sem);
   } else {
     MUTEX_UNLOCK(&sclock);
@@ -131,8 +137,11 @@ int gtkRunSomeSaveCalls() {
     return NO;
   }
   i = randomi(pscCount);
-  if (TRUE == g_idle_remove_by_data(psc[i]->args))
-    psc[i]->func(psc[i]);
+  g_idle_remove_by_data(psc[i]->args); 
+  /* yes, ignore return value here, GTK seems
+     to be dropping these during shutdown, and
+     we still want to run them nevertheless */
+  psc[i]->func(psc[i]);
   MUTEX_UNLOCK(&sclock);
   gnunet_util_sleep(50 * cronMILLIS);
   /* sleep here is somewhat important, first of
diff --git a/src/core/main.c b/src/core/main.c
index f3dedca7..9d6c0638 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -111,7 +111,7 @@ int main(int argc,
   /* start the event loop */
   gdk_threads_enter();    
   gtk_main();
-  gdk_threads_leave(); 
+  gdk_threads_leave();
   setCustomLogProc(NULL);
   while (YES == gtkRunSomeSaveCalls()) ;    
   stopCron();
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index c0d4a4f4..ab765fab 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -82,7 +82,7 @@ static void updateAppModelSafe(void * unused) {
         gtk_list_store_set(model,
                            &iter,
                            0, pos,
-                           1, desc,
+                           1, dgettext("GNUnet", desc),
                            -1);
         FREENONNULL(desc);
       }    
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 6e1c84c0..99d61239 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -113,8 +113,7 @@ static int getConnectedNodesStat(const void * closure,
   if (OK != getStatValue(&val,
                          NULL,
                          NULL,
-                         dgettext("GNUnet",
-                                  "# of connected peers"))) 
+                         "# of connected peers")) 
     return SYSERR;
   data[0][0] = 0.8 * val / connectionGoal;
   return OK;
@@ -127,8 +126,7 @@ static int getCPULoadStat(const void * closure,
   if (OK != getStatValue(&val,
                          NULL,
                          NULL,
-                         dgettext("GNUnet",
-                                  "% of allowed cpu load")))
+                        "% of allowed cpu load"))
     return SYSERR;
   data[0][0] = val / 125.0;
   return OK;
@@ -151,21 +149,18 @@ static int getTrafficRecvStats(const void * closure,
   if (OK != getStatValue(&total,        
                          &ltotal,
                          &dtime,
-                         dgettext("GNUnet",
-                                  "# bytes decrypted")))
+                         "# bytes decrypted"))
     return SYSERR;
   if (OK != getStatValue(&noise,
                          &lnoise,
                          NULL,
-                         dgettext("GNUnet",
-                                  "# bytes of noise received")))
+                         "# bytes of noise received"))
     return SYSERR;
   i = 0;
   buffer = MALLOC(512);
   SNPRINTF(buffer, 
            512,
-           dgettext("GNUnet",
-                    "# bytes received of type %d"),
+           "# bytes received of type %d",
            GAP_p2p_PROTO_RESULT);
   if (OK != getStatValue(&content,
                          &lcontent,
@@ -177,8 +172,7 @@ static int getTrafficRecvStats(const void * closure,
   i = 0;
   SNPRINTF(buffer, 
            512,
-           dgettext("GNUnet",
-                    "# bytes received of type %d"),
+           "# bytes received of type %d",
            GAP_p2p_PROTO_QUERY);
   if (OK != getStatValue(&queries,
                          &lqueries,
@@ -231,21 +225,18 @@ static int getTrafficSendStats(const void * closure,
   if (OK != getStatValue(&total,        
                          &ltotal,
                          &dtime,
-                         dgettext("GNUnet",
-                                  "# bytes encrypted")))
+                          "# bytes encrypted"))
     return SYSERR;
   if (OK != getStatValue(&noise,
                          &lnoise,
                          NULL,
-                         dgettext("GNUnet",
-                                  "# bytes noise sent")))
+                          "# bytes noise sent"))
     return SYSERR;
   i = 0;
   buffer = MALLOC(512);
   SNPRINTF(buffer, 
            512,
-           dgettext("GNUnet",
-                    "# bytes transmitted of type %d"),
+            "# bytes transmitted of type %d",
            GAP_p2p_PROTO_RESULT);
   if (OK != getStatValue(&content,
                          &lcontent,
@@ -257,8 +248,7 @@ static int getTrafficSendStats(const void * closure,
   i = 0;
   SNPRINTF(buffer, 
            512,
-           dgettext("GNUnet",
-                    "# bytes received of type %d"),
+            "# bytes received of type %d",
            GAP_p2p_PROTO_QUERY);
   if (OK == getStatValue(&queries,
                          &lqueries,