[GNUnet-SVN] r2232 - gnunet-gtk/src/plugins/fs

[durner]

Author: durner
Date: 2005-11-03 11:01:35 -0800 (Thu, 03 Nov 2005)
New Revision: 2232

Modified:
   gnunet-gtk/src/plugins/fs/download.c
Log:
disregard path of file to clear (check filename and URI only)

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2005-11-03 17:42:55 UTC (rev 
2231)
+++ gnunet-gtk/src/plugins/fs/download.c        2005-11-03 19:01:35 UTC (rev 
2232)
@@ -563,7 +563,7 @@
                            int isRecursive,
                            unsigned int anonymityLevel) {
   GtkTreeIter iter;
-  char * f;
+  char * f, * f2, * fn;
   struct ECRS_URI * u;
 
   if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
@@ -572,10 +572,16 @@
       gtk_tree_model_get(GTK_TREE_MODEL(summary),
                          &iter,
                          DOWNLOAD_FILENAME, &f,
+                         DOWNLOAD_LINKNAME, &f2,
                          DOWNLOAD_URI, &u,
                          -1);
+                         
+      f = strrchr(f, DIR_SEPARATOR);
+      f2 = strrchr(f2, DIR_SEPARATOR);
+      fn = strrchr(filename, DIR_SEPARATOR);
+                         
       if ( (ECRS_equalsUri(u, uri)) &&
-           (0 == strcmp(f, filename)) ) {
+           (0 == strcmp(f, fn) || 0 == strcmp(f2, fn)) ) {
         gtk_tree_store_remove(summary,
                               &iter);
         break;