cleanup

3 files changed, 22 insertions, 21 deletions

diff --git a/TODO b/TODO
index ea1c35ab..fec3cddd 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,7 @@
 - deadlock (download directory, download files in
   directory, clear (multiple) completed downloads
   => strange deadlock)
+- Assertion failed at download.c:264 in fs_download_started.
 - disable inactive buttons (if no search/download 
   is selected to operate on) [ medium ] [pre1]
 - highlight active downloads in search list [ easy ] [pre1]
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index bdae8406..9d8d446f 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -60,9 +60,8 @@ addFilesToDirectory(const ECRS_FileInfo * fi,
                           &iter,
                           path);
   gtk_tree_path_free(path);
-  /* check for existing entry -- this function
-     maybe called multiple times for the same
-     directory entry */
+  /* check for existing entry -- this function maybe called multiple
+     times for the same directory entry */
   for (i=gtk_tree_model_iter_n_children(model,
                                         &iter)-1;i>=0;i--) {
     if (TRUE == gtk_tree_model_iter_nth_child(model,
@@ -214,6 +213,7 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
                                  path);
   gtk_tree_path_free(path);
   list->searchList = sl_parent;
+  list->searchViewRowReference = NULL;
   if (sl_parent != NULL) {
     if (dl_parent != NULL) {
       GtkTreeIter piter;
@@ -256,11 +256,12 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
         }
       } while (TRUE == gtk_tree_model_iter_next(GTK_TREE_MODEL(sl_parent->tree),
                                                 &iter));
+    } else {
+      GE_BREAK(ectx, 0);
     }
     if (valid == FALSE) {
-      /* did not find matching entry in search list
-         -- bug!  Continue without adding to to
-         search list! */
+      /* did not find matching entry in search list -- bug!  Continue
+         without adding to to search list! */
       GE_BREAK(ectx, 0);
       list->searchList = NULL;
     }
@@ -290,6 +291,7 @@ void fs_download_update(DownloadList * list,
   GtkTreeIter iter;
   GtkTreePath * path;
   unsigned int val;
+  struct ECRS_MetaData * meta;
 
   path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
   gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
@@ -307,8 +309,6 @@ void fs_download_update(DownloadList * list,
   if ( (list->is_directory == YES) &&
        (list->searchList != NULL) &&
        (list->searchViewRowReference != NULL) ) {
-    struct ECRS_MetaData * meta;
-
     meta = NULL;
     ECRS_listDirectory(ectx,
                        data,
@@ -560,7 +560,6 @@ initiateDownload(GtkTreeModel * model,
   }
   gtk_tree_path_free(dirTreePath);
 
-
   /* construct completed/directory/real-filename */
   idc_final_download_destination = MALLOC(strlen(final_download_dir) + 2 +
                                           strlen(idc_name) + strlen(GNUNET_DIRECTORY_EXT) +
@@ -574,7 +573,8 @@ initiateDownload(GtkTreeModel * model,
          dirPath);
   disk_directory_create(ectx,
                         idc_final_download_destination);
-  strcat(idc_final_download_destination, idc_name);
+  strcat(idc_final_download_destination, 
+         idc_name);
   if ( (idc_final_download_destination[strlen(idc_final_download_destination) - 1] == '/') ||
        (idc_final_download_destination[strlen(idc_final_download_destination) - 1] == '\\') )
     idc_final_download_destination[strlen(idc_final_download_destination) - 1] = '\0';
@@ -585,13 +585,14 @@ initiateDownload(GtkTreeModel * model,
          (0 != strcmp(&idc_final_download_destination[strlen(idc_final_download_destination)
                                                       - strlen(GNUNET_DIRECTORY_EXT)],
                       GNUNET_DIRECTORY_EXT)) ) )
-    strcat(idc_final_download_destination, GNUNET_DIRECTORY_EXT);
+    strcat(idc_final_download_destination, 
+           GNUNET_DIRECTORY_EXT);
 
-  /* FIXME: check that there is no pending download
-     for idc_name! */
+  /* FIXME: check that there is no pending download for idc_name! */
   if (OK == check_pending(idc_name,
                           NULL)) {
-    addLogEntry(_("Downloading `%s'"), idc_name);
+    addLogEntry(_("Downloading `%s'"),
+                idc_name);
     FSUI_startDownload(ctx,
                        getSpinButtonValue(searchContext->searchXML,
                                           "downloadAnonymitySpinButton"),
@@ -602,7 +603,8 @@ initiateDownload(GtkTreeModel * model,
                        searchContext->fsui_list,
                        (parentContext != NULL) ? parentContext->fsui_list : NULL);
   } else {
-    addLogEntry(_("ERROR: already downloading `%s'"), idc_name);
+    addLogEntry(_("ERROR: already downloading `%s'"),
+                idc_name);
   }
   FREE(uri_name);
   FREE(dirPath);
@@ -634,7 +636,6 @@ void on_downloadButton_clicked_fs(GtkWidget * treeview,
  *
  * TODO:
  * - support for recursive downloads
- * - support for showing directories (if downloaded like this)
  * - support for user-specified filename
  */
 void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry,
@@ -682,7 +683,8 @@ void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry,
     strcat(idc_final_download_destination, DIR_SEPARATOR_STR);
   strcat(idc_final_download_destination, dname);
 
-  addLogEntry(_("Downloading `%s'"), uris);
+  addLogEntry(_("Downloading `%s'"), 
+              uris);
   idc_meta = ECRS_createMetaData();
   FSUI_startDownload(ctx,
                      getSpinButtonValue(getMainXML(),
@@ -710,7 +712,7 @@ static void * fsui_callback(void * cls) {
   return NULL;
 }
 
-static gboolean
+static void
 clearCompletedDownloadCallback(GtkTreeModel * model,
                                GtkTreePath * path,
                                GtkTreeIter * iter,
@@ -730,7 +732,6 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
     run_with_save_calls(&fsui_callback,
                         &fcbc);
   }
-  return FALSE;
 }
 
 void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 54ac87a0..5b14a19f 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -420,7 +420,7 @@ static void * fsui_callback(void * cls) {
   return NULL;
 }
 
-static gboolean
+static void
 clearCompletedUploadCallback(GtkTreeModel * model,
                              GtkTreePath * path,
                              GtkTreeIter * iter,
@@ -440,7 +440,6 @@ clearCompletedUploadCallback(GtkTreeModel * model,
     run_with_save_calls(&fsui_callback,
                         &fcbc);
   }
-  return FALSE;
 }
 
 void on_clearCompletedUploadsButton_clicked_fs(void * unused,