[maemo-commits] [maemo-commits] r13581 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-04 16:13:54 +0300 (Tue, 04 Sep 2007)
New Revision: 13581

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-09-04  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-switcher-menu-item.c (hd_switcher_menu_item_icon_animation):
	add some safety checks before setting back from animation to pixbuf
	when blinking is disabled.
	* src/hd-switcher-menu.c (hd_switcher_menu_changed_info_cb): disable
	blinking when the when the window entry info is not urgent anymore.
	Fixes: NB#58375.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-04 13:08:47 UTC (rev 13580)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-04 13:13:54 UTC (rev 13581)
@@ -1,3 +1,12 @@
+2007-09-04  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-switcher-menu-item.c (hd_switcher_menu_item_icon_animation):
+	add some safety checks before setting back from animation to pixbuf
+	when blinking is disabled.
+	* src/hd-switcher-menu.c (hd_switcher_menu_changed_info_cb): disable
+	blinking when the when the window entry info is not urgent anymore.
+	Fixes: NB#58375.
+
 2007-09-04 Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-desktop-picture.c,

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-09-04 13:08:47 UTC (rev 13580)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-09-04 13:13:54 UTC (rev 13581)
@@ -279,24 +279,25 @@
   if (is_on)
   {
     pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (icon));
-              
+
     pixbuf_anim = hn_app_pixbuf_anim_blinker_new (pixbuf,
                                                   1000 / ANIM_FPS,
 					          -1,
 						  10);
 
-    gtk_image_set_from_animation (GTK_IMAGE(icon), pixbuf_anim);
+    gtk_image_set_from_animation (GTK_IMAGE (icon), pixbuf_anim);
 
     g_object_unref (pixbuf_anim);
   }
-  else
+  else if (gtk_image_get_storage_type (GTK_IMAGE (icon)) == GTK_IMAGE_ANIMATION)
   {
     pixbuf_anim = gtk_image_get_animation (GTK_IMAGE (icon));
-    g_debug ("Turning animation off");      
-    /* grab static image from menu item and reset */
+
+    /* Grab static image from menu item and reset */
     pixbuf = gdk_pixbuf_animation_get_static_image (pixbuf_anim);
 
     gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf);
+
     g_object_unref (pixbuf);
   }
 }

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-04 13:08:47 UTC (rev 13580)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-04 13:13:54 UTC (rev 13581)
@@ -2050,8 +2050,10 @@
     {
       /* child of one of the app buttons */
       if (!hd_switcher_menu_item_is_blinking (HD_SWITCHER_MENU_ITEM (menu_item)))
+      {
         hd_switcher_menu_item_set_blinking (HD_SWITCHER_MENU_ITEM (menu_item), TRUE);
-
+      }
+	      
       if (make_it_blink)
       {	      
         hd_switcher_menu_replace_blinking_icon
@@ -2061,6 +2063,10 @@
       }
     }
   }
+  else if (hd_switcher_menu_item_is_blinking (HD_SWITCHER_MENU_ITEM (menu_item)))
+  {
+    hd_switcher_menu_item_set_blinking (HD_SWITCHER_MENU_ITEM (menu_item), FALSE);
+  }
 }
 
 static void