4 files changed, 59 insertions, 5 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 9b6839b8..15ed911d 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -309,7 +309,7 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
         gtk_tree_path_free(path);
         gtk_tree_store_set(sl_parent->tree,
                            &iter,
-                           SEARCH_CELL_BG_COLOR, "yellow",
+                           SEARCH_CELL_BG_COLOR, getColorCode(URITRACK_DOWNLOAD_STARTED),
                            -1);
         break;
       }
@@ -398,7 +398,7 @@ void fs_download_completed(DownloadList * downloadContext) {
     gtk_tree_path_free(path);
     gtk_tree_store_set(downloadContext->searchList->tree,
                        &iter,
-                       SEARCH_CELL_BG_COLOR, "green",
+                       SEARCH_CELL_BG_COLOR,  getColorCode(URITRACK_DOWNLOAD_COMPLETED),
                        -1);
   }
   downloadContext->has_terminated = YES;
@@ -410,7 +410,20 @@ void fs_download_completed(DownloadList * downloadContext) {
  * possibly refresh directory listing.
  */
 void fs_download_aborted(DownloadList * downloadContext) {
-  /* FIXME: update summary? / search list status entry! */
+  GtkTreeIter iter;
+  GtkTreePath * path;
+
+  if (downloadContext->searchViewRowReference != NULL) {
+    path = gtk_tree_row_reference_get_path(downloadContext->searchViewRowReference);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(downloadContext->searchList->tree),
+                            &iter,
+                            path);
+    gtk_tree_path_free(path);
+    gtk_tree_store_set(downloadContext->searchList->tree,
+                       &iter,
+                       SEARCH_CELL_BG_COLOR,  getColorCode(URITRACK_DOWNLOAD_ABORTED),
+                       -1);
+  }
   downloadContext->has_terminated = YES;
   refreshDirectoryViewFromDisk(downloadContext);
 }
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 4514bb9a..f3d4d459 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -649,4 +649,26 @@ void done_fs() {
   CO_done();
 }
 
+
+const char * getColorCode(enum URITRACK_STATE state) {
+  if (state & (URITRACK_DIRECTORY_ADDED))
+    return "blue";
+  if (state & (URITRACK_INSERTED || URITRACK_INDEXED))
+    return "cyan";
+  if ( (state & URITRACK_DOWNLOAD_STARTED) &&
+       (0 == (state & 
+              (URITRACK_DOWNLOAD_COMPLETED |
+               URITRACK_DOWNLOAD_ABORTED)) ) )
+    return "yellow";
+  if (state & URITRACK_DOWNLOAD_COMPLETED) 
+    return "springgreen";
+  if (state & URITRACK_DOWNLOAD_ABORTED) 
+    return "red";
+  if (state & (URITRACK_SEARCH_RESULT |
+               URITRACK_DIRECTORY_FOUND) ) 
+    return "gray";
+  return "white";
+}
+
+
 /* end of fs.c */
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 0cba8086..efe5d0eb 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -29,6 +29,7 @@
 
 #include <GNUnet/gnunet_ecrs_lib.h>
 #include <GNUnet/gnunet_fsui_lib.h>
+#include <GNUnet/gnunet_uritrack_lib.h>
 #include "gnunetgtk_common.h"
 
 /**
@@ -316,4 +317,7 @@ extern GtkTreeStore * download_summary;
 
 extern GtkTreeStore * upload_summary;
 
+const char * getColorCode(enum URITRACK_STATE state);
+
+
 #endif
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 3cbde2f9..a3ac8bc0 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -106,7 +106,11 @@ void addEntryToSearchTree(SearchList * searchContext,
   unsigned long long size;
   char * size_h;
   GdkPixbuf * pixbuf;
+  enum URITRACK_STATE state;
 
+  state = URITRACK_getState(ectx,
+                            cfg,
+                            info->uri);
   mime = getMimeTypeFromMetaData(info->meta);
   desc = getDescriptionFromMetaData(info->meta);
   name = getFileNameFromMetaData(info->meta);
@@ -123,7 +127,7 @@ void addEntryToSearchTree(SearchList * searchContext,
                      SEARCH_PIXBUF, pixbuf,
                      SEARCH_URI, ECRS_dupUri(info->uri),
                      SEARCH_META, ECRS_dupMetaData(info->meta),
-                     SEARCH_CELL_BG_COLOR, "white",
+                     SEARCH_CELL_BG_COLOR, getColorCode(state),
                      SEARCH_CELL_FG_COLOR, "black",
                      SEARCH_INTERNAL, searchContext,
                      SEARCH_INTERNAL_PARENT, downloadParent,
@@ -147,7 +151,18 @@ void fs_search_result_received(SearchList * searchContext,
                                const struct ECRS_URI * uri) {
   GtkTreeStore * model;
   GtkTreeIter iter;
-
+  enum URITRACK_STATE state;
+
+  state = URITRACK_getState(ectx,
+                            cfg,
+                            info->uri);
+  if ( (state & (URITRACK_INSERTED | 
+                 URITRACK_INDEXED) ) &&
+       (YES == GC_get_configuration_value_yesno(cfg,
+                                                "GNUNET-GTK",
+                                                "DISABLE-OWN",
+                                                YES)) )
+    return; 
   model = GTK_TREE_STORE(gtk_tree_view_get_model(searchContext->treeview));
   gtk_tree_store_append(model,
                         &iter,