[GNUnet-SVN] r2850 - in gnunet-gtk/src: common core

[grothoff]

Author: grothoff
Date: 2006-05-19 11:16:59 -0700 (Fri, 19 May 2006)
New Revision: 2850

Modified:
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/core/main.c
Log:
minor gtk fixes

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2006-05-19 18:05:57 UTC (rev 2849)
+++ gnunet-gtk/src/common/helper.c      2006-05-19 18:16:59 UTC (rev 2850)
@@ -124,6 +124,7 @@
     gtk_idle_add(&saveCallWrapper,
                 &call);
     MUTEX_UNLOCK(&sclock);
+    PTHREAD_KILL(&mainThread, SIGALRM);
     SEMAPHORE_DOWN(call.sem);
     SEMAPHORE_FREE(call.sem);
   } else {
@@ -335,12 +336,8 @@
       *next = '\0'; /* add 0-termination for pos */
       next++;
     }
-    if (strlen(pos) > 0) {
-      LOG(LOG_DEBUG,
-         "Loading plugin `%s'\n",
-         pos);
-      loadPlugin(pos);
-    }
+    if (strlen(pos) > 0) 
+      loadPlugin(pos);    
   } while (next != NULL);
   FREE(dup);
 }
@@ -398,7 +395,6 @@
     load = STRDUP("about daemon fs");
   loadPlugins(load);
   FREE(load);
-
   connectGladeWithPlugins(mainXML);
   connectGladeWithPlugins(statusXML);
 }
@@ -414,7 +410,6 @@
     unloadPlugin(plugin);
     plugin = next;
   }
-
   gtk_widget_destroy(infoWindow);
   infoWindow = NULL;
   UNREF(statusXML);
@@ -424,7 +419,6 @@
   gladeFile = NULL;
 
   saveCallsUp = NO;
-  PTHREAD_REL_SELF(&mainThread);
   MUTEX_LOCK(&sclock);
   for (i=0;i<pscCount;i++)
     psc[i]->func(psc[i]);
@@ -442,6 +436,7 @@
 }
 
 void doneGNUnetGTKCommon() {
+  PTHREAD_REL_SELF(&mainThread);
   MUTEX_DESTROY(&sclock);
 }
 
@@ -483,13 +478,17 @@
     while (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig)) {
       MUTEX_LOCK(&sclock);
       if (pscCount > 0) {
-       i = randomi(pscCount);
+       i = weak_randomi(pscCount);
        if (TRUE == g_idle_remove_by_data(psc[i]))
          saveCallWrapper(psc[i]);
+      } else {
+       i = -1;
       }
       MUTEX_UNLOCK(&sclock);
-      if (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig))
+      if ( (i == -1) &&
+          (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig)) ) {
        gnunet_util_sleep(50 * cronMILLIS);
+      }
     }
   }
   PTHREAD_JOIN(&doneThread,

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2006-05-19 18:05:57 UTC (rev 2849)
+++ gnunet-gtk/src/core/main.c  2006-05-19 18:16:59 UTC (rev 2850)
@@ -147,7 +147,6 @@
   gdk_threads_leave();
   doneGNUnetGTKCommon();
   doneUtil();
-
   return 0;
 }