2009-02-16 Alberto Garcia <agarcia@igalia.com>

* src/hildon-banner.c (hildon_banner_show_animation): Don't allow
	user-defined icons, use always the default one.

	Fixes: NB#101916 (Do not allow custom icons on animation banner)

diff --git a/ChangeLog b/ChangeLog
index 0131ea4..ad3ad13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-16  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-banner.c (hildon_banner_show_animation): Don't allow
+       user-defined icons, use always the default one.
+
+       Fixes: NB#101916 (Do not allow custom icons on animation banner)
+
 2009-02-13  Alejandro G. Castro  <alex@igalia.com>
 
        This patch was applied before but reverted because it caused

diff --git a/src/hildon-banner.c b/src/hildon-banner.c
index c548105..13a29bb 100644 (file)
--- a/src/hildon-banner.c
+++ b/src/hildon-banner.c
@@ -1016,8 +1016,9 @@ hildon_banner_show_information_with_markup      (GtkWidget *widget,
 /**
  * hildon_banner_show_animation:
  * @widget: the #GtkWidget that wants to display banner
- * @animation_name: The progress animation to use. You usually can just
- *                  pass %NULL for the default animation.
+ * @animation_name: since Hildon 2.2 this parameter is not used
+ *                  anymore and any value that you pass will be
+ *                  ignored
  * @text: the text to display.
  *
  * Shows an animated progress notification. It's recommended not to try
@@ -1053,13 +1054,11 @@ hildon_banner_show_animation                    (GtkWidget *widget,
     GtkWidget *image_widget;
     const gchar *filename;
 
-    g_return_val_if_fail (animation_name == NULL || animation_name[0] != 0, NULL);
     g_return_val_if_fail (text != NULL, NULL);
 
     /* Find out which animation to use */
     theme = gtk_icon_theme_get_default ();
-    info = gtk_icon_theme_lookup_icon (theme, animation_name ?   /* FIXME: consider using: gtk_icon_theme_load_icon() */
-            animation_name : HILDON_BANNER_DEFAULT_PROGRESS_ANIMATION,
+    info = gtk_icon_theme_lookup_icon (theme, HILDON_BANNER_DEFAULT_PROGRESS_ANIMATION,
             HILDON_ICON_SIZE_STYLUS, 0);
 
     /* Try to load animation. One could try to optimize this