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

[gnunet]

Author: grothoff
Date: 2008-06-01 20:51:16 -0600 (Sun, 01 Jun 2008)
New Revision: 6992

Modified:
   gnunet-gtk/src/plugins/fs/download.c
   gnunet-gtk/src/plugins/fs/fs.c
Log:
fixing bad call to mmap and dead button update

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2008-06-02 02:43:51 UTC (rev 
6991)
+++ gnunet-gtk/src/plugins/fs/download.c        2008-06-02 02:51:16 UTC (rev 
6992)
@@ -84,7 +84,7 @@
 refreshDirectoryViewFromDisk (DownloadList * list)
 {
   unsigned long long size;
-  char *data;
+  const char *data;
   int fd;
   char *fn;
   struct GNUNET_ECRS_MetaData *meta;
@@ -126,7 +126,7 @@
       GNUNET_free_non_null (fn);
       return;
     }
-  fd = GNUNET_disk_file_open (ectx, list->filename, O_RDONLY);
+  fd = GNUNET_disk_file_open (ectx, f, O_RDONLY);
   if (fd == -1)
     {
       GNUNET_free_non_null (fn);
@@ -146,7 +146,7 @@
   meta = NULL;
   GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta,
                                        &addFilesToDirectory, list);
-  MUNMAP (data, size);
+  MUNMAP ((void*)data, size);
   CLOSE (fd);
   if (meta != NULL)
     GNUNET_ECRS_meta_data_destroy (meta);

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2008-06-02 02:43:51 UTC (rev 6991)
+++ gnunet-gtk/src/plugins/fs/fs.c      2008-06-02 02:51:16 UTC (rev 6992)
@@ -293,12 +293,6 @@
                                    "activeUploadsList")));
   button =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "cancelUploadButton");
-  gtk_widget_set_sensitive (button,
-                            gtk_tree_selection_count_selected_rows (selection)
-                            > 0);
-  button =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                           "stopUploadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)