4 files changed, 43 insertions, 15 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 1cd8c70a..9ed2d21b 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -681,7 +681,8 @@ handle_sks_zone_identity (void *cls,
  * @param tc scheduler context, unused
  */
 static void
-run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls,
+     const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   unsigned long long dl_parallel;
   unsigned long long req_parallel;
@@ -777,11 +778,17 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   /* FIXME: should these '1's be here? Maybe better to put them into
    * default config files?
    */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context.cfg, "gnunet-fs-gtk",
-      "MAX_PARALLEL_DOWNLOADS", &dl_parallel))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (main_context.cfg,
+                                             "gnunet-fs-gtk",
+                                             "MAX_PARALLEL_DOWNLOADS",
+                                             &dl_parallel))
     dl_parallel = DEFAULT_MAX_PARALLEL_DOWNLOADS;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context.cfg, "gnunet-fs-gtk",
-      "MAX_PARALLEL_REQUESTS", &req_parallel))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (main_context.cfg,
+                                             "gnunet-fs-gtk",
+                                             "MAX_PARALLEL_REQUESTS",
+                                             &req_parallel))
     req_parallel = DEFAULT_MAX_PARALLEL_REQUESTS;
 
   /* initialize file-sharing */
@@ -798,8 +805,12 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_GTK_main_loop_quit (cls);
     return;
   }
-  arm = GNUNET_ARM_connect (main_context.cfg, &arm_connection_state_change, &main_context);
-  armon = GNUNET_ARM_monitor (main_context.cfg, service_status_change, &main_context);
+  arm = GNUNET_ARM_connect (main_context.cfg,
+                            &arm_connection_state_change,
+                            &main_context);
+  armon = GNUNET_ARM_monitor (main_context.cfg,
+                              &service_status_change,
+                              &main_context);
   main_context.gns = GNUNET_GNS_connect (main_context.cfg);
   main_context.identity = GNUNET_IDENTITY_connect (main_context.cfg, NULL, NULL);
   main_context.id_op = GNUNET_IDENTITY_get (main_context.identity,
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index aeb932a5..66c1ed59 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -56,11 +56,11 @@ struct DownloadAsDialogContext
   char *dirname;
 
   /**
-   * Set to GNUNET_YES if pressing "Save" button should initiate the download
-   * right away, set to GNUNET_NO if it should only change directory and file
+   * Set to #GNUNET_YES if pressing "Save" button should initiate the download
+   * right away, set to #GNUNET_NO if it should only change directory and file
    * names on the download panel.
-   * Popup menu sets it to GNUNET_YES, download panel "Change name" button sets
-   * it to GNUNET_NO.
+   * Popup menu sets it to #GNUNET_YES, download panel "Change name" button sets
+   * it to #GNUNET_NO.
    */
   int download_directly;
 };
@@ -189,7 +189,9 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
   else if (de->sr != NULL && de->sr->tab != NULL && de->sr->rr != NULL)
   {
     /* Update download panel */
-    GNUNET_FS_GTK_set_item_downloaded_name (de->sr->tab->ts, de->sr->rr, de->filename);
+    GNUNET_FS_GTK_set_item_downloaded_name (de->sr->tab->ts,
+                                            de->sr->rr,
+                                            de->filename);
     GNUNET_FS_GTK_free_download_entry (de);
   }
   /* we were successful, do not remove the directory (if we created one) */
@@ -198,7 +200,9 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
   clean_up_download_as_context (dlc);
 }
 
-/* FIXME: implement handling for corner cases:
+
+/*
+** FIXME: implement handling for corner cases:
  * A) Selection changes in search tab while SaveAs dialog is open.
  *    If it's in direct download mode, ignore that; otherwise destroy the dialog.
  * B) Download! is pressed in download panel (or the search result is otherwise
@@ -280,6 +284,7 @@ open_saveas_dialog (struct DownloadEntry *de, int download_directly)
   gtk_window_present (GTK_WINDOW (dlc->dialog));
 }
 
+
 /**
  * Open the 'save as' dialog for a download.  Calls the 'dc->cb'
  * continutation when the dialog is complete.  Will release the 'dc'
@@ -294,6 +299,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadEntry *de)
   open_saveas_dialog (de, GNUNET_YES);
 }
 
+
 /**
  * Open the 'save as' dialog for a download.  Calls the 'dc->cb'
  * continutation when the dialog is complete.  Will release the 'dc'
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 2bf54fdd..26577c42 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -2908,8 +2908,10 @@ static void
 mark_download_progress (struct DownloadEntry *de,
                         const char *filename,
                         uint64_t size,
-                        uint64_t completed, const void *block_data,
-                        uint64_t offset, uint64_t block_size,
+                        uint64_t completed,
+                        const void *block_data,
+                        uint64_t offset,
+                        uint64_t block_size,
                         unsigned int depth)
 {
   GtkTreeIter iter;
@@ -2932,12 +2934,16 @@ mark_download_progress (struct DownloadEntry *de,
        a custom CellRenderer... */
     gtk_tree_store_set (de->sr->tab->ts, &iter,
                         SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ?  (100 * completed / size) : 100),
+                        SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) ((size > 0) ?  (100 * completed / size) : 100),
+                        SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (completed ? -1 : 0),
                         SEARCH_TAB_MC_COMPLETED, completed,
                         -1);
   }
   get_download_list_entry (de, &diter);
   gtk_tree_store_set (downloads_treestore, &diter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ?  (100 * completed / size) : 100),
+                      SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) ((size > 0) ?  (100 * completed / size) : 100),
+                      SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (completed ? -1 : 0),
                       SEARCH_TAB_MC_COMPLETED, completed,
                       -1);
   if (completed < size)
@@ -3222,6 +3228,8 @@ setup_download (struct DownloadEntry *de,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ? (100 * completed / size) : 100),
                       SEARCH_TAB_MC_FILENAME, filename,
                       SEARCH_TAB_MC_STATUS_COLOUR, "blue",
+                      SEARCH_TAB_MC_PERCENT_AVAILABILITY, 0,
+                      SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
                       SEARCH_TAB_MC_SEARCH_RESULT, de->sr,
                       SEARCH_TAB_MC_COMPLETED, (guint64) completed,
                       SEARCH_TAB_MC_DOWNLOADED_FILENAME, de->filename,
@@ -3235,6 +3243,8 @@ setup_download (struct DownloadEntry *de,
                       SEARCH_TAB_MC_FILENAME, filename,
                       SEARCH_TAB_MC_STATUS_COLOUR, "blue",
                       SEARCH_TAB_MC_SEARCH_RESULT, de->sr,
+                      SEARCH_TAB_MC_PERCENT_AVAILABILITY, 0,
+                      SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
                       SEARCH_TAB_MC_COMPLETED, (guint64) completed,
                       SEARCH_TAB_MC_DOWNLOADED_FILENAME, de->filename,
                       SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, de->anonymity,
diff --git a/src/fs/gnunet-fs-gtk_main-window-view-toggles.c b/src/fs/gnunet-fs-gtk_main-window-view-toggles.c
index f8e1b9c3..ea24ed96 100644
--- a/src/fs/gnunet-fs-gtk_main-window-view-toggles.c
+++ b/src/fs/gnunet-fs-gtk_main-window-view-toggles.c
@@ -119,4 +119,5 @@ GNUNET_GTK_main_menu_view_search_toggled_cb (GtkWidget * dummy,
                "GNUNET_GTK_main_menu_search_preview");
 }
 
+
 /* end of gnunet-fs-gtk_main-window-view-toggles.c */