diff options
Diffstat (limited to 'src/plugins/fs/download.c')
-rw-r--r-- | src/plugins/fs/download.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c index 8d2e0b20..3121e627 100644 --- a/src/plugins/fs/download.c +++ b/src/plugins/fs/download.c | |||
@@ -288,11 +288,10 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl, | |||
288 | gtk_tree_store_set (sl_parent->tree, | 288 | gtk_tree_store_set (sl_parent->tree, |
289 | &iter, SEARCH_STATUS, | 289 | &iter, SEARCH_STATUS, |
290 | getStatusName | 290 | getStatusName |
291 | (GNUNET_URITRACK_DOWNLOAD_STARTED), | 291 | (GNUNET_URITRACK_DOWNLOAD_STARTED), |
292 | SEARCH_STATUS_LOGO, | 292 | SEARCH_STATUS_LOGO, |
293 | getStatusLogo | 293 | getStatusLogo |
294 | (GNUNET_URITRACK_DOWNLOAD_STARTED), | 294 | (GNUNET_URITRACK_DOWNLOAD_STARTED), -1); |
295 | -1); | ||
296 | break; | 295 | break; |
297 | } | 296 | } |
298 | valid = gtk_tree_model_iter_next (model, &iter); | 297 | valid = gtk_tree_model_iter_next (model, &iter); |
@@ -448,8 +447,7 @@ fs_download_stopped (DownloadList * list) | |||
448 | GNUNET_free (list->filename); | 447 | GNUNET_free (list->filename); |
449 | GNUNET_ECRS_uri_destroy (list->uri); | 448 | GNUNET_ECRS_uri_destroy (list->uri); |
450 | 449 | ||
451 | if ( (list->searchList != NULL) && | 450 | if ((list->searchList != NULL) && (list->searchViewRowReference != NULL)) |
452 | (list->searchViewRowReference != NULL) ) | ||
453 | { | 451 | { |
454 | path = gtk_tree_row_reference_get_path (list->searchViewRowReference); | 452 | path = gtk_tree_row_reference_get_path (list->searchViewRowReference); |
455 | if (path == NULL) | 453 | if (path == NULL) |
@@ -461,13 +459,14 @@ fs_download_stopped (DownloadList * list) | |||
461 | model = GTK_TREE_MODEL (list->searchList->tree); | 459 | model = GTK_TREE_MODEL (list->searchList->tree); |
462 | gtk_tree_model_get_iter (model, &iter, path); | 460 | gtk_tree_model_get_iter (model, &iter, path); |
463 | gtk_tree_path_free (path); | 461 | gtk_tree_path_free (path); |
464 | gtk_tree_store_set (list->searchList->tree, | 462 | gtk_tree_store_set (list->searchList->tree, |
465 | &iter, | 463 | &iter, |
466 | SEARCH_STATUS, | 464 | SEARCH_STATUS, |
467 | getStatusName (GNUNET_URITRACK_DOWNLOAD_ABORTED), | 465 | getStatusName |
468 | SEARCH_STATUS_LOGO, | 466 | (GNUNET_URITRACK_DOWNLOAD_ABORTED), |
469 | getStatusLogo (GNUNET_URITRACK_DOWNLOAD_ABORTED), | 467 | SEARCH_STATUS_LOGO, |
470 | -1); | 468 | getStatusLogo |
469 | (GNUNET_URITRACK_DOWNLOAD_ABORTED), -1); | ||
471 | } | 470 | } |
472 | } | 471 | } |
473 | if (list->searchViewRowReference != NULL) | 472 | if (list->searchViewRowReference != NULL) |
@@ -767,8 +766,7 @@ on_downloadButton_clicked_fs (GtkWidget * treeview, | |||
767 | */ | 766 | */ |
768 | gboolean | 767 | gboolean |
769 | on_searchResults_button_press_fs (GtkWidget * treeview, | 768 | on_searchResults_button_press_fs (GtkWidget * treeview, |
770 | GdkEventButton * event, | 769 | GdkEventButton * event, gpointer data) |
771 | gpointer data) | ||
772 | { | 770 | { |
773 | if (event->type == GDK_2BUTTON_PRESS) | 771 | if (event->type == GDK_2BUTTON_PRESS) |
774 | on_downloadButton_clicked_fs (treeview, NULL); | 772 | on_downloadButton_clicked_fs (treeview, NULL); |
@@ -886,8 +884,7 @@ clearCompletedDownloadCallback (GtkTreeModel * model, | |||
886 | } | 884 | } |
887 | 885 | ||
888 | void | 886 | void |
889 | on_clearCompletedDownloads_clicked_fs (void *unused, | 887 | on_clearCompletedDownloads_clicked_fs (void *unused, GtkWidget * clearButton) |
890 | GtkWidget * clearButton) | ||
891 | { | 888 | { |
892 | GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (download_summary), | 889 | GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (download_summary), |
893 | &clearCompletedDownloadCallback, NULL); | 890 | &clearCompletedDownloadCallback, NULL); |
@@ -956,9 +953,10 @@ on_activeDownloadsList_button_press_fs (GtkWidget * treeview, | |||
956 | GNUNET_GTK_connect_glade_with_plugins (contextMenuXML); | 953 | GNUNET_GTK_connect_glade_with_plugins (contextMenuXML); |
957 | menu = glade_xml_get_widget (contextMenuXML, "downloadsContextMenu"); | 954 | menu = glade_xml_get_widget (contextMenuXML, "downloadsContextMenu"); |
958 | if (event_button->button == 3) | 955 | if (event_button->button == 3) |
959 | gtk_menu_popup (GTK_MENU(menu), | 956 | gtk_menu_popup (GTK_MENU (menu), |
960 | NULL, NULL, NULL, NULL, | 957 | NULL, NULL, NULL, NULL, |
961 | event_button->button, event_button->time); | 958 | event_button->button, event_button->time); |
962 | return FALSE; | 959 | return FALSE; |
963 | } | 960 | } |
961 | |||
964 | /* end of download.c */ | 962 | /* end of download.c */ |