[GNUnet-SVN] r2251 - in gnunet-gtk: po src/plugins/fs

[grothoff]

Author: grothoff
Date: 2005-11-14 02:16:53 -0800 (Mon, 14 Nov 2005)
New Revision: 2251

Modified:
   gnunet-gtk/po/Makefile.in
   gnunet-gtk/src/plugins/fs/meta.c
   gnunet-gtk/src/plugins/fs/search.c
Log:
fixing bug 935

Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in   2005-11-14 10:04:21 UTC (rev 2250)
+++ gnunet-gtk/po/Makefile.in   2005-11-14 10:16:53 UTC (rev 2251)
@@ -20,7 +20,7 @@
 top_srcdir = ..
 
 
-prefix = /usr/local
+prefix = /home/grothoff/
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale

Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c    2005-11-14 10:04:21 UTC (rev 2250)
+++ gnunet-gtk/src/plugins/fs/meta.c    2005-11-14 10:16:53 UTC (rev 2251)
@@ -332,7 +332,7 @@
                                    NULL)) {
        char * binary;
 
-       binary = EXTRACTOR_binaryEncode(thumb,
+       binary = EXTRACTOR_binaryEncode((const unsigned char*)thumb,
                                        length);
        free(thumb);
        ECRS_addToMetaData(meta,

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2005-11-14 10:04:21 UTC (rev 2250)
+++ gnunet-gtk/src/plugins/fs/search.c  2005-11-14 10:16:53 UTC (rev 2251)
@@ -435,6 +435,13 @@
   BREAK();
 }
 
+static void * stopSearch(void * u) {
+  struct ECRS_URI * uri = u;
+  FSUI_stopSearch(ctx,
+                 uri);
+  return NULL;
+}
+
 void on_closeSearchButton_clicked(GtkWidget * searchPage,
                                  GtkWidget * closeButton) {
   GtkWidget * notebook;
@@ -459,8 +466,9 @@
        return;
 
   uri = list->uri;
-  FSUI_stopSearch(ctx,
-                 uri);
+
+  run_with_save_calls(&stopSearch,
+                     uri);
   if (prev == NULL)
     head = list->next;
   else