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

[gnunet]

Author: grothoff
Date: 2008-07-29 12:02:36 -0600 (Tue, 29 Jul 2008)
New Revision: 7527

Modified:
   gnunet-gtk/TODO
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/namespace_create.c
   gnunet-gtk/src/plugins/fs/namespace_search.c
   gnunet-gtk/src/plugins/fs/search.c
Log:
fixes

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2008-07-29 03:13:11 UTC (rev 7526)
+++ gnunet-gtk/TODO     2008-07-29 18:02:36 UTC (rev 7527)
@@ -1,6 +1,9 @@
 This is just the current plan, plans change.
 
 0.8.1 [8'08] (aka "growth"):
+- bugs:
+  * manual entry of namespace name in search tab does not
+    work (results in global search)
 - improve collection handling
   * show content of current collection somewhere
   * add 'publish now' button / menu entry

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-07-29 03:13:11 UTC (rev 7526)
+++ gnunet-gtk/gnunet-gtk.glade 2008-07-29 18:02:36 UTC (rev 7527)
@@ -1005,6 +1005,7 @@
                             <property name="adjustment">1 0 999999 1 10 
10</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
+                            <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -1602,6 +1603,7 @@
                                 <property name="adjustment">1 0 10000 1 10 
10</property>
                                 <property name="climb_rate">1</property>
                                 <property name="numeric">True</property>
+                                <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
                               </widget>
                             </child>
                           </widget>

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2008-07-29 03:13:11 UTC (rev 7526)
+++ gnunet-gtk/src/plugins/fs/fs.c      2008-07-29 18:02:36 UTC (rev 7527)
@@ -82,7 +82,8 @@
 on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy)
 {
   gint val;
-  GdkColor color;
+  GdkColor bcolor;
+  GdkColor fcolor;
   GtkSpinButton *spin;
 
   spin = GTK_SPIN_BUTTON (w);
@@ -95,15 +96,23 @@
   if (val == 0)
     {
       if ((TRUE == gdk_color_parse ("red",
-                                    &color)) &&
+                                    &bcolor)) &&
           (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (),
-                                             &color, FALSE, TRUE)))
-        gtk_widget_modify_base (w, GTK_STATE_NORMAL, &color);
+                                             &bcolor, FALSE, TRUE)) &&
+         (TRUE == gdk_color_parse ("black",
+                                    &fcolor)) &&
+          (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (),
+                                             &fcolor, FALSE, TRUE)))
+       {
+         gtk_widget_modify_base (w, GTK_STATE_NORMAL, &bcolor);
+         gtk_widget_modify_text (w, GTK_STATE_NORMAL, &fcolor);
+       }
     }
   else
-    gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
-
-
+    {
+      gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
+      gtk_widget_modify_text (w, GTK_STATE_NORMAL, NULL);
+    }
 }
 
 static void *

Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c        2008-07-29 03:13:11 UTC 
(rev 7526)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c        2008-07-29 18:02:36 UTC 
(rev 7527)
@@ -270,7 +270,8 @@
           gtk_widget_destroy (dialog);
         }
       GNUNET_meta_data_destroy (meta);
-      GNUNET_ECRS_uri_destroy (keywordURI);
+      if (keywordURI != NULL)
+       GNUNET_ECRS_uri_destroy (keywordURI);
     }
   gtk_widget_destroy (dialog);
   UNREF (metaXML);

Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c        2008-07-29 03:13:11 UTC 
(rev 7526)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c        2008-07-29 18:02:36 UTC 
(rev 7527)
@@ -184,6 +184,8 @@
     }
   else
     {
+      /* FIXME: may still be namespace selected --
+        where user manually entered NS name! */
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
       gtk_widget_set_sensitive (spin, FALSE);
     }

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2008-07-29 03:13:11 UTC (rev 7526)
+++ gnunet-gtk/src/plugins/fs/search.c  2008-07-29 18:02:36 UTC (rev 7527)
@@ -76,10 +76,21 @@
                      searchContext->searchString,
                      strlen (searchContext->searchString) > 20 ? "..." : "",
                      searchContext->resultsReceived);
+  if (new_title == NULL)
+    new_title =
+      g_strdup_printf (_("invalid characters (%u)"),
+                      searchContext->resultsReceived);
   label = GTK_LABEL (glade_xml_get_widget (searchContext->labelXML,
                                            "searchTabLabel"));
-  gtk_label_set (label, new_title);
-  GNUNET_free (new_title);
+  if (new_title != NULL) 
+    {
+      gtk_label_set (label, new_title);
+      GNUNET_free (new_title);
+    }
+  else
+    {
+      gtk_label_set (label, _("Internal error"));
+    }
 }
 
 static GdkPixbuf *
@@ -1154,6 +1165,11 @@
       if (nsName != NULL)
         free (nsName);
     }
+  else
+    {
+      /* FIXME: may still be namespace-search
+        -- where user manually entered NS name*/
+    }
   if (fsss.uri == NULL)
     fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
   if (fsss.uri == NULL)