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

[gnunet]

Author: amatus
Date: 2008-08-26 21:58:56 -0600 (Tue, 26 Aug 2008)
New Revision: 7634

Modified:
   gnunet-gtk/src/plugins/fs/directory.c
   gnunet-gtk/src/plugins/fs/download.c
Log:
more different this time


Modified: gnunet-gtk/src/plugins/fs/directory.c
===================================================================
--- gnunet-gtk/src/plugins/fs/directory.c       2008-08-27 03:49:13 UTC (rev 
7633)
+++ gnunet-gtk/src/plugins/fs/directory.c       2008-08-27 03:58:56 UTC (rev 
7634)
@@ -68,7 +68,7 @@
 
 static int
 spcb (const GNUNET_ECRS_FileInfo * fi,
-      unsigned long long offset, void *closure)
+      const GNUNET_HashCode * key, int isRoot, void *closure)
 {
   SearchList *list = closure;
   fs_search_result_received (list, fi, list->uri);
@@ -123,7 +123,7 @@
   list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
   GNUNET_ECRS_uri_destroy (uri);
   GNUNET_ECRS_directory_list_contents (NULL,
-                                       directory_data, directory_data_len, 0,
+                                       directory_data, directory_data_len, 
NULL,
                                        &md, &spcb, list);
   if (md != NULL)
     GNUNET_meta_data_destroy (md);

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2008-08-27 03:49:13 UTC (rev 
7633)
+++ gnunet-gtk/src/plugins/fs/download.c        2008-08-27 03:58:56 UTC (rev 
7634)
@@ -41,7 +41,7 @@
  */
 static int
 addFilesToDirectory (const GNUNET_ECRS_FileInfo * fi,
-                     unsigned long long offset, void *closure)
+                     const GNUNET_HashCode * key, int isRoot, void *closure)
 {
   DownloadList *list = closure;
   GtkTreeIter iter;
@@ -50,6 +50,8 @@
   GtkTreePath *path;
   GtkTreeModel *model;
 
+  if (isRoot == GNUNET_YES)
+    return GNUNET_OK;
   if (!gtk_tree_row_reference_valid (list->searchViewRowReference))
     return GNUNET_SYSERR;
   model = GTK_TREE_MODEL (list->searchList->tree);
@@ -143,7 +145,7 @@
     }
   GNUNET_free_non_null (fn);
   meta = NULL;
-  GNUNET_ECRS_directory_list_contents (ectx, data, size, 0, &meta,
+  GNUNET_ECRS_directory_list_contents (ectx, data, size, NULL, &meta,
                                        &addFilesToDirectory, list);
   MUNMAP ((void *) data, size);
   CLOSE (fd);
@@ -349,7 +351,7 @@
     {
       meta = NULL;
       GNUNET_ECRS_directory_list_contents (ectx,
-                                           data, size, 0, &meta,
+                                           data, size, NULL, &meta,
                                            &addFilesToDirectory, list);
       if (meta != NULL)
         GNUNET_meta_data_destroy (meta);