1 files changed, 12 insertions, 5 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index b77615d6..d7ac628e 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -213,12 +213,18 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
   list->searchList = sl_parent;
   if (sl_parent != NULL) {
     if (dl_parent != NULL) {
+      GtkTreeIter piter;
+
       /* have parent, must be download from
          directory inside of search */
       path = gtk_tree_row_reference_get_path(dl_parent->searchViewRowReference);
       valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(sl_parent->tree),
-                                      &iter,
+                                      &piter,
                                       path);      
+      if (valid == TRUE)
+        valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(sl_parent->tree),
+                                             &iter,
+                                             &piter);      
     } else {
       /* must be top-level entry in search */
       valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(sl_parent->tree),
@@ -563,7 +569,7 @@ void on_downloadButton_clicked_fs(GtkWidget * treeview,
   GtkTreeSelection * selection;
 
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &initiateDownload,
      NULL);
@@ -682,7 +688,8 @@ void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  gtk_tree_selection_selected_foreach
+  
+  ggc_tree_selection_selected_foreach
     (selection,
      &clearCompletedDownloadCallback,
      NULL);
@@ -716,7 +723,7 @@ void on_abortDownloadButton_clicked_fs(void * unused,
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallDownloadCallback,
      &FSUI_abortDownload);
@@ -730,7 +737,7 @@ void on_stopDownloadButton_clicked_fs(void * unused,
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallDownloadCallback,
      &FSUI_stopDownload);