[GNUnet-SVN] r4879 - in gnunet-gtk: . src/common src/plugins/fs

[gnunet]

Author: grothoff
Date: 2007-05-31 01:31:35 -0600 (Thu, 31 May 2007)
New Revision: 4879

Modified:
   gnunet-gtk/ChangeLog
   gnunet-gtk/TODO
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/plugins/fs/fs.c
Log:
zero anonymity warning and deadlock fix

Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog        2007-05-31 06:41:45 UTC (rev 4878)
+++ gnunet-gtk/ChangeLog        2007-05-31 07:31:35 UTC (rev 4879)
@@ -1,3 +1,8 @@
+Thu May 31 01:30:23 MDT 2007
+       Added color-coding of search results.
+       Added warning (red background) if anonymity level is zero.
+       Fixed (rare) deadlock.  
+
 Sun Mar 25 13:49:12 MDT 2007
        Releasing gnunet-gtk 0.7.1c.
 

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2007-05-31 06:41:45 UTC (rev 4878)
+++ gnunet-gtk/TODO     2007-05-31 07:31:35 UTC (rev 4879)
@@ -12,7 +12,6 @@
 
 0.7.2 (goal: re-enable all 0.7.0 features):
 - #917 (peer-info view)
-- #939 zero anonymity warning
 - create custom gtk logger (via memory logger?) [see also #1027]
 
 0.7.2a:

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2007-05-31 06:41:45 UTC (rev 4878)
+++ gnunet-gtk/gnunet-gtk.glade 2007-05-31 07:31:35 UTC (rev 4879)
@@ -1352,7 +1352,8 @@
                                      <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
                                      <property 
name="snap_to_ticks">False</property>
                                      <property name="wrap">False</property>
-                                     <property name="adjustment">1 1 999999 1 
10 10</property>
+                                     <property name="adjustment">1 0 999999 1 
10 10</property>
+                                     <signal name="value_changed" 
handler="on_anonymity_spin_changed_" last_modification_time="Thu, 31 May 2007 
07:05:10 GMT"/>
                                    </widget>
                                    <packing>
                                      <property name="padding">0</property>
@@ -1876,6 +1877,7 @@
                          <property name="snap_to_ticks">False</property>
                          <property name="wrap">False</property>
                          <property name="adjustment">1 0 100000 1 10 
10</property>
+                         <signal name="value_changed" 
handler="on_anonymity_spin_changed_" last_modification_time="Thu, 31 May 2007 
07:05:38 GMT"/>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
@@ -2423,7 +2425,8 @@
                          <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">False</property>
                          <property name="wrap">False</property>
-                         <property name="adjustment">0 0 10000 1 10 
10</property>
+                         <property name="adjustment">1 0 10000 1 10 
10</property>
+                         <signal name="value_changed" 
handler="on_anonymity_spin_changed_" last_modification_time="Thu, 31 May 2007 
07:15:00 GMT"/>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -4757,6 +4760,7 @@
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
                      <property name="adjustment">1 0 100000 1 10 10</property>
+                     <signal name="value_changed" 
handler="on_anonymity_spin_changed_" last_modification_time="Thu, 31 May 2007 
07:06:46 GMT"/>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -6225,7 +6229,7 @@
       <property name="tooltip" translatable="yes">Close the selected 
search</property>
       <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"/>
+      <signal name="activate" handler="on_close_selected_search_activate_" 
last_modification_time="Tue, 14 Jun 2005 23:59:56 GMT"/>
 
       <child internal-child="image">
        <widget class="GtkImage" id="image18">
@@ -6249,7 +6253,7 @@
       <property name="visible">True</property>
       <property name="label">gtk-clear</property>
       <property name="use_stock">True</property>
-      <signal name="activate" handler="on_clear_known_content_activate" 
last_modification_time="Wed, 15 Jun 2005 00:09:05 GMT"/>
+      <signal name="activate" handler="on_clear_known_content_activate_" 
last_modification_time="Wed, 15 Jun 2005 00:09:05 GMT"/>
     </widget>
   </child>
 </widget>

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2007-05-31 06:41:45 UTC (rev 4878)
+++ gnunet-gtk/src/common/helper.c      2007-05-31 07:31:35 UTC (rev 4879)
@@ -336,7 +336,7 @@
     Plugin * next;
 
     next = plugin->next;
-    gtkSaveCall(&unloadPlugin, (void *) plugin);
+    unloadPlugin(plugin);
     plugin = next;
   }
   UNREF(mainXML);

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2007-05-31 06:41:45 UTC (rev 4878)
+++ gnunet-gtk/src/plugins/fs/fs.c      2007-05-31 07:31:35 UTC (rev 4879)
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include <GNUnet/gnunet_collection_lib.h>
+#include <gdk/gdk.h>
 #include "fs.h"
 #include "download.h"
 #include "search.h"
@@ -62,6 +63,41 @@
 static unsigned int last_y;
 
 
+
+/**
+ * The selection of the download summary changed.
+ * Update button status.
+ */
+void on_anonymity_spin_changed_fs(GtkWidget * w,
+                                 gpointer dummy) {
+  gint val;
+  GdkColor color;
+  GtkSpinButton * spin;
+
+  spin = GTK_SPIN_BUTTON(w);
+  if (spin == NULL) {
+    GE_BREAK(NULL, 0);
+    return;
+  }
+  val = gtk_spin_button_get_value_as_int(spin);
+  if (val == 0) {
+    if ( (TRUE == gdk_color_parse("red",
+                                 &color)) &&
+        (TRUE == gdk_colormap_alloc_color(gdk_colormap_get_system(),
+                                          &color,
+                                          FALSE,
+                                          TRUE)) )      
+      gtk_widget_modify_base(w,
+                          GTK_STATE_NORMAL,
+                          &color);  
+  } else
+    gtk_widget_modify_base(w,
+                        GTK_STATE_NORMAL,
+                        NULL);
+  
+
+}
+
 static void *
 saveEventProcessor(void * cls) {
   const FSUI_Event * event = cls;
@@ -636,16 +672,26 @@
                   NULL);
 }
 
-void done_fs() {
+static void * hide_save_call(void * arg) {
   GtkWidget * tab;
 
   tab
     = glade_xml_get_widget(getMainXML(),
                           "fsnotebook");
   gtk_widget_hide(tab);
-  FSUI_stop(ctx);
+  return NULL;
+}
+
+static void * cleanup_save_call(void * arg) {
   fs_summary_stop();
   fs_namespace_stop();
+  return NULL;
+}
+
+void done_fs() {
+  gtkSaveCall(&hide_save_call, NULL);
+  FSUI_stop(ctx);
+  gtkSaveCall(&cleanup_save_call, NULL);
   CO_done();
 }