[GNUnet-SVN] r22055 - in gnunet-gtk: contrib src/fs

[gnunet]

Author: grothoff
Date: 2012-06-17 10:35:02 +0200 (Sun, 17 Jun 2012)
New Revision: 22055

Added:
   gnunet-gtk/contrib/error.gif
Modified:
   gnunet-gtk/contrib/Makefile.am
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
Log:
-adding animations for errors, this should fix #2217

Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am      2012-06-17 06:50:45 UTC (rev 22054)
+++ gnunet-gtk/contrib/Makefile.am      2012-06-17 08:35:02 UTC (rev 22055)
@@ -16,6 +16,7 @@
   downloading.gif \
   downloading_not_receiving.gif \
   downloaded.gif \
+  error.gif \
   found_source.gif \
   published.gif \
   publishing.gif \

Added: gnunet-gtk/contrib/error.gif
===================================================================
(Binary files differ)


Property changes on: gnunet-gtk/contrib/error.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-06-17 06:50:45 UTC 
(rev 22054)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-06-17 08:35:02 UTC 
(rev 22055)
@@ -290,8 +290,13 @@
  */
 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 @@
     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 @@
     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");
 }