[GNUnet-SVN] r2643 - in gnunet-gtk: . src/common

[grothoff]

Author: grothoff
Date: 2006-04-23 04:12:44 -0700 (Sun, 23 Apr 2006)
New Revision: 2643

Modified:
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/common/helper.c
Log:
fix

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-04-23 10:40:43 UTC (rev 2642)
+++ gnunet-gtk/gnunet-gtk.glade 2006-04-23 11:12:44 UTC (rev 2643)
@@ -3713,7 +3713,6 @@
                      <property name="focus_on_click">True</property>
                      <signal name="clicked" 
handler="on_closeSearchButton_clicked" object="searchPageScrolledWindow" 
last_modification_time="Thu, 26 May 2005 22:42:37 GMT"/>
                      <signal name="activate" 
handler="on_closeSearchButton_clicked" object="searchPageScrolledWindow" 
last_modification_time="Fri, 27 May 2005 13:14:33 GMT"/>
-                     <accelerator key="Escape" modifiers="0" 
signal="activate"/>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -5135,7 +5134,6 @@
       <property name="label" translatable="yes">_Close</property>
       <property name="use_underline">True</property>
       <signal name="activate" handler="on_close_selected_search_activate" 
last_modification_time="Tue, 14 Jun 2005 23:59:56 GMT"/>
-      <accelerator key="C" modifiers="0" signal="activate"/>
 
       <child internal-child="image">
        <widget class="GtkImage" id="image18">

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2006-04-23 10:40:43 UTC (rev 2642)
+++ gnunet-gtk/src/common/helper.c      2006-04-23 11:12:44 UTC (rev 2643)
@@ -476,8 +476,7 @@
                          &cls,
                          64*1024))
     DIE_STRERROR("pthread_create");
-  if ( (! PTHREAD_SELF_TEST(&mainThread)) ||
-       (pscCount == 0) ) {
+  if (! PTHREAD_SELF_TEST(&mainThread)) {
     /* another thread will run the save calls */
     SEMAPHORE_DOWN(cls.sig);
   } else {
@@ -489,7 +488,8 @@
          saveCallWrapper(psc[i]);
       }
       MUTEX_UNLOCK(&sclock);
-      gnunet_util_sleep(50 * cronMILLIS);
+      if (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig))
+       gnunet_util_sleep(50 * cronMILLIS);
     }
   }
   PTHREAD_JOIN(&doneThread,