1 files changed, 7 insertions, 40 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index a7aef9ba..32fc4e88 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_download-save-as.h"
 #include "gnunet-fs-gtk_event-handler.h"
 
@@ -424,6 +425,10 @@ start_download (GtkTreeView *tree_view,
   dc->anonymity = anonymity;
   dc->is_recursive = is_recursive;
   dc->tab = tab;
+  fprintf (stderr,
+           "lp %d, have-sug: %d\n",
+           local_parents,
+           have_a_suggestion);
   if ( (GNUNET_YES == local_parents) &&
        (GNUNET_YES == have_a_suggestion) )
     /* Skip the dialog, call directly */
@@ -1099,44 +1104,6 @@ handle_search_error (struct SearchTab *tab,
 
 
 /**
- * Obtain the string we will use to describe a search result from
- * the respective meta data.
- *
- * @param meta meta data to inspect
- * @return description of the result in utf-8, never NULL
- */
-static char *
-get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
-{
-  char *desc;
-  char *utf8_desc;
-
-  desc =
-      GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-                                                     EXTRACTOR_METATYPE_PACKAGE_NAME,
-                                                     EXTRACTOR_METATYPE_TITLE,
-                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
-                                                     EXTRACTOR_METATYPE_FILENAME,
-                                                     EXTRACTOR_METATYPE_DESCRIPTION,
-                                                     EXTRACTOR_METATYPE_SUMMARY,
-                                                     EXTRACTOR_METATYPE_ALBUM,
-                                                     EXTRACTOR_METATYPE_COMMENT,
-                                                     EXTRACTOR_METATYPE_SUBJECT,
-                                                     EXTRACTOR_METATYPE_KEYWORDS,
-                                                     -1);
-  if (desc == NULL)
-    return GNUNET_strdup (_("no description supplied"));
-  utf8_desc =
-    GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
-                                        strlen (desc) + 1);
-  GNUNET_free (desc);
-  if (utf8_desc == NULL)
-    return GNUNET_strdup (_("no description supplied"));
-  return utf8_desc;
-}
-
-
-/**
  * Obtain the mime type (or format description) will use to describe a search result from
  * the respective meta data.
  *
@@ -1192,7 +1159,7 @@ update_search_result (struct SearchResult *sr,
               "Updating search result SR=%p with %d, %u, %u\n",
               sr, availability_rank,
               availability_certainty, applicability_rank);
-  desc = get_description_from_metadata (meta);
+  desc = GNUNET_FS_GTK_get_description_from_metadata (meta);
   mime = get_mimetype_from_metadata (meta);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   tp = gtk_tree_row_reference_get_path (sr->rr);
@@ -1304,7 +1271,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
     }
     uris = GNUNET_FS_uri_to_string (uri);
   }
-  desc = get_description_from_metadata (meta);
+  desc = GNUNET_FS_GTK_get_description_from_metadata (meta);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
 
   sr = GNUNET_malloc (sizeof (struct SearchResult));