1 files changed, 38 insertions, 22 deletions

diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 486633f4..f718f456 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2008 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -86,10 +86,44 @@ fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri)
 }
 
 void
-fs_upload_error (UploadList * list)
+fs_upload_aborted (UploadList * list)
 {
-  /* FIXME: indicate error in summary dialog! */
+  GtkTreeIter iter;
+  GtkTreePath *path;
+
   list->has_terminated = GNUNET_YES;
+  list->uri = NULL;
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_tree_store_set (upload_summary, &iter,
+                      UPLOAD_URISTRING, _("Aborted."), 
+                      UPLOAD_PROGRESS, 0, 
+                      -1);
+}
+
+void
+fs_upload_error (UploadList * list, const char * emsg)
+{
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  char *us;
+  size_t len;
+
+  list->has_terminated = GNUNET_YES;
+  list->uri = NULL;
+  len = strlen(_("Error uploading file: `%s'")) + strlen(emsg) + 2;
+  us = GNUNET_malloc(len);
+  GNUNET_snprintf(us, len,
+                  _("Error uploading file: `%s'"),
+                  emsg);
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_tree_store_set (upload_summary, &iter,
+                      UPLOAD_URISTRING, us, 
+                      UPLOAD_PROGRESS, 0, -1);
+  GNUNET_free (us);
 }
 
 void
@@ -130,7 +164,7 @@ UploadList *
 fs_upload_started (struct GNUNET_FSUI_UploadList *fsui,
                    UploadList * parent,
                    const char *filename,
-                   struct GNUNET_ECRS_URI *uri,
+                   const struct GNUNET_ECRS_URI *uri,
                    unsigned long long total,
                    unsigned long long completed, GNUNET_FSUI_State state)
 {
@@ -652,20 +686,6 @@ fsuiCallUploadCallback (GtkTreeModel * model,
 }
 
 void
-on_abortUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
-{
-  GtkTreeSelection *selection;
-  GtkWidget *uploadList;
-
-  uploadList =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "activeUploadsList");
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
-  GNUNET_GTK_tree_selection_selected_foreach
-    (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_abort);
-}
-
-void
 on_stopUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
 {
   GtkTreeSelection *selection;
@@ -677,10 +697,6 @@ on_stopUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_abort);
-  GNUNET_GTK_tree_selection_selected_foreach
-    (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_stop);
 }
 
-
-
 /* end of upload.c */