fixing bug 935

3 files changed, 12 insertions, 4 deletions

diff --git a/po/Makefile.in b/po/Makefile.in
index 60fcf9a0..9199d5d1 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -20,7 +20,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr/local
+prefix = /home/grothoff/
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 50d41729..fd216aca 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -332,7 +332,7 @@ struct ECRS_MetaData * getMetaDataFromList(GladeXML * xml,
                                     NULL)) {
         char * binary;
 
-        binary = EXTRACTOR_binaryEncode(thumb,
+        binary = EXTRACTOR_binaryEncode((const unsigned char*)thumb,
                                         length);
         free(thumb);
         ECRS_addToMetaData(meta,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 9de0a2cc..b4697500 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -435,6 +435,13 @@ void displaySearchResult(const ECRS_FileInfo * info,
   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 @@ void on_closeSearchButton_clicked(GtkWidget * searchPage,
         return;
 
   uri = list->uri;
-  FSUI_stopSearch(ctx,
-                  uri);
+
+  run_with_save_calls(&stopSearch,
+                      uri);
   if (prev == NULL)
     head = list->next;
   else