-fixes, including grabbing FS handle as soon as possible

3 files changed, 58 insertions, 12 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 1617b5d2..ef5e03a7 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -101,6 +101,19 @@ GNUNET_FS_GTK_get_fs_handle ()
 
 
 /**
+ * Remember FS handle if we don't have one yet.
+ *
+ * @param fsh file sharing handle to use
+ */
+void
+GNUNET_FS_GTK_set_fs_handle (struct GNUNET_FS_Handle *fsh)
+{
+  if (NULL == fs)
+    fs = fsh;
+}
+
+
+/**
  * Get our configuration.
  *
  * @return configuration handle
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index c5cfa7d6..c19e07b8 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -215,6 +215,14 @@ GNUNET_FS_GTK_get_fs_handle (void);
 
 
 /**
+ * Remember FS handle if we don't have one yet.
+ *
+ * @param fsh file sharing handle to use
+ */
+void
+GNUNET_FS_GTK_set_fs_handle (struct GNUNET_FS_Handle *fsh);
+
+/**
  * Get an object from the main window.
  *
  * @param name name of the object
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index cab95366..030f5e88 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -978,23 +978,33 @@ struct sks_scanner_callback_context
   void *cls;
 };
 
-/* Metadata callback. Checks metadata item for being an SKS URI,
+
+/**
+ * Metadata callback. Checks metadata item for being an SKS URI,
  * invokes the callback if so.
+ *
+ * @return GNUNET_OK if we did not invoke the callback, otherwise
+ *         whatever the callback returned
  */
 static int
-check_for_embedded_sks (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
-              enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
-              const char *data, size_t data_size)
+check_for_embedded_sks (void *cls, 
+                        const char *plugin_name, 
+                        enum EXTRACTOR_MetaType type,
+                        enum EXTRACTOR_MetaFormat format,
+                        const char *data_mime_type,
+                        const char *data, size_t data_size)
 {
   struct sks_scanner_callback_context *ctx = cls;
   int result;
 
+  result = GNUNET_OK;
   if ((EXTRACTOR_METATYPE_URI == type) &&
       (EXTRACTOR_METAFORMAT_UTF8 == format) &&
       (data_mime_type && (0 == strcmp ("text/plain", data_mime_type))))
   {
     struct GNUNET_FS_Uri *sks_uri;
     char *emsg;
+
     emsg = NULL;
     sks_uri = GNUNET_FS_uri_parse (data, &emsg);
     if (NULL != sks_uri)
@@ -1018,16 +1028,23 @@ check_for_embedded_sks (void *cls, const char *plugin_name, enum EXTRACTOR_MetaT
   return result;
 }
 
-/* Search metadata for SKS URIs, invoke the callback for each one. */
+
+/**
+ * Search metadata for SKS URIs, invoke the callback for each one. 
+ */
 static void
-find_embedded_sks (const struct GNUNET_CONTAINER_MetaData *meta, embedded_sks_callback cb, void *cls)
+find_embedded_sks (const struct GNUNET_CONTAINER_MetaData *meta, 
+                   embedded_sks_callback cb, void *cls)
 {
   struct sks_scanner_callback_context ctx;
+
   ctx.cb = cb;
   ctx.cls = cls;
-  GNUNET_CONTAINER_meta_data_iterate (meta, check_for_embedded_sks, &ctx);
+  GNUNET_CONTAINER_meta_data_iterate (meta, 
+                                      &check_for_embedded_sks, &ctx);
 }
 
+
 struct sks_population_context
 {
   GtkMenu *menu;
@@ -2143,11 +2160,16 @@ update_search_result (struct SearchResult *sr,
   gtk_tree_path_free (tp);
 }
 
+
 static int
-see_if_there_are_any_sks_uris (void *cls, const struct GNUNET_FS_Uri *sks_uri,
-    const char *sks_uri_string, struct GNUNET_FS_PseudonymIdentifier *nsid)
+see_if_there_are_any_sks_uris (void *cls,
+                               const struct GNUNET_FS_Uri *sks_uri,
+                               const char *sks_uri_string, 
+                               struct GNUNET_FS_PseudonymIdentifier *nsid)
 {
-  * ((gboolean *) cls) = TRUE;
+  gboolean *gb = cls;
+
+  *gb = TRUE;
   return GNUNET_SYSERR;
 }
 
@@ -2231,7 +2253,9 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
   desc = GNUNET_FS_GTK_get_description_from_metadata (meta, &desc_is_a_dup);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
 
-  find_embedded_sks (meta, see_if_there_are_any_sks_uris, &show_ns_association);
+  find_embedded_sks (meta, 
+                     &see_if_there_are_any_sks_uris,
+                     &show_ns_association);
 
   sr = GNUNET_new (struct SearchResult);
   sr->result = result;
@@ -3695,7 +3719,8 @@ GNUNET_GTK_fs_event_handler (void *cls,
                              const struct GNUNET_FS_ProgressInfo *info)
 {
   void *ret;
-
+  
+  GNUNET_FS_GTK_set_fs_handle (info->fsh);
   switch (info->status)
   {
   case GNUNET_FS_STATUS_PUBLISH_START: