better metadata handling and indicator for new search results

3 files changed, 19 insertions, 1 deletions

diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index ee4bfdd9..43e1531a 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -38,6 +38,8 @@ publishMetaData (EXTRACTOR_KeywordType type, const char *data, void *cls)
   const char *stype;
   GtkTreeIter iter;
 
+  if (EXTRACTOR_isBinaryType(type))
+    return GNUNET_OK;
   stype = EXTRACTOR_getKeywordTypeAsString (type);
   if (stype == NULL)            /* wrong LE version!? */
     stype = _("unknown");
@@ -186,6 +188,10 @@ createMetaTypeComboBox (GladeXML * xml, const char *name)
                            GTK_TREE_MODEL (keywordTypeModel));
   for (type = 0; type < EXTRACTOR_getHighestKeywordTypeNumber (); type++)
     {
+      if ( (type == EXTRACTOR_SPLIT) ||
+           (type == EXTRACTOR_LOWERCASE) ||
+           (EXTRACTOR_isBinaryType(type)) )
+        continue; /* these are not legal... */  
       stype = EXTRACTOR_getKeywordTypeAsString (type);
       gtk_list_store_append (keywordTypeModel, &iter);
       gtk_list_store_set (keywordTypeModel,
diff --git a/src/plugins/fs/status.c b/src/plugins/fs/status.c
index a191794e..45a0e540 100644
--- a/src/plugins/fs/status.c
+++ b/src/plugins/fs/status.c
@@ -49,6 +49,8 @@ getColorCode (enum GNUNET_URITRACK_STATE state)
   if (state &
       (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
     return "gray";
+  if (0 == state)
+    return "aquamarine";
   return NULL;
 }
 
@@ -72,6 +74,8 @@ getStatusName (enum GNUNET_URITRACK_STATE state)
   if (state &
       (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
     return "";
+  if (0 == state)
+    return _("new");
   return "";
 }
 
@@ -99,6 +103,10 @@ getStatusLogo (enum GNUNET_URITRACK_STATE state)
     return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                      GTK_STOCK_CANCEL, 16, 0,
                                      (GError **) NULL);
+  if (0 == state)
+    return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+                                     GTK_STOCK_NEW, 16, 0,
+                                     (GError **) NULL);
   return NULL;
 }
 
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 4b17e2c6..d126c17a 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -447,10 +447,14 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
   while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR))
     filenamerest--;
   GNUNET_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
+  keywordURI = GNUNET_meta_data_to_uri (meta);
+  while (GNUNET_OK ==
+         GNUNET_meta_data_delete (meta, EXTRACTOR_SPLIT, NULL));
+  while (GNUNET_OK ==
+         GNUNET_meta_data_delete (meta, EXTRACTOR_LOWERCASE, NULL));  
   createMetaDataListTreeView (metaXML,
                               "metaDataDialogMetaDataList",
                               "previewImage", meta);
-  keywordURI = GNUNET_meta_data_to_uri (meta);
   GNUNET_meta_data_destroy (meta);
   createKeywordListTreeView (metaXML,
                              "metaDataDialogKeywordList", keywordURI);