-adding animations for errors, this should fix #2217

3 files changed, 15 insertions, 2 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 48d2c230..b8290635 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -16,6 +16,7 @@ pkgdata_DATA = \
   downloading.gif \
   downloading_not_receiving.gif \
   downloaded.gif \
+  error.gif \
   found_source.gif \
   published.gif \
   publishing.gif \
diff --git a/contrib/error.gif b/contrib/error.gif
new file mode 100644
index 00000000..274fa091
--- /dev/null
+++ b/contrib/error.gif
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index fb2d0056..3b9ff698 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -290,6 +290,11 @@ static struct GNUNET_FS_AnimationContext *animation_searching_sources;
  */
 static struct GNUNET_FS_AnimationContext *animation_found_sources;
 
+/**
+ * Animation to display if we encountered a hard error.
+ */
+static struct GNUNET_FS_AnimationContext *animation_error;
+
 
 
 /* ***************** Search event handling ****************** */
@@ -2437,10 +2442,13 @@ mark_download_error (struct DownloadEntry *de,
     return;
   }
   gtk_tree_path_free (path);
+  if (NULL == animation_error)
+    animation_error = load_animation ("error");
   gtk_tree_store_set (de->sr->tab->ts, &iter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 0,
                       SEARCH_TAB_MC_URI_AS_STRING, emsg,
-                      SEARCH_TAB_MC_STATUS_ICON, NULL /* FIXME: error icon? */,
+                      SEARCH_TAB_MC_STATUS_ICON, 
+                      GNUNET_GTK_animation_context_get_pixbuf (animation_error),
                       -1);
 }
 
@@ -2744,10 +2752,14 @@ handle_publish_error (struct PublishEntry *pe,
     return;
   }
   gtk_tree_path_free (path);
+  if (NULL == animation_error)
+    animation_error = load_animation ("error");
   gtk_tree_store_set (pe->tab->ts, &iter, 
                       PUBLISH_TAB_MC_RESULT_STRING, emsg,
                       PUBLISH_TAB_MC_PROGRESS, 100,
-                      PUBLISH_TAB_MC_STATUS_ICON, NULL /* FIXME: error status icon? */,
+                      PUBLISH_TAB_MC_STATUS_ICON, 
+                      SEARCH_TAB_MC_STATUS_ICON, 
+                      GNUNET_GTK_animation_context_get_pixbuf (animation_error),
                       -1);
   change_publish_color (pe, "red");
 }