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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-10 14:05:11 +0300 (Mon, 10 Sep 2007)
New Revision: 13702

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

	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu,
	hd_switcher_get_default_icon_from_entry_info): make sure the blinking
	icon in switcher menu button has the correct dimensions.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-10 10:41:04 UTC (rev 13701)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-10 11:05:11 UTC (rev 13702)
@@ -1,3 +1,9 @@
+2007-09-10  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu,
+	hd_switcher_get_default_icon_from_entry_info): make sure the blinking
+	icon in switcher menu button has the correct dimensions.
+
 2007-09-10 Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 0.0.35

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-10 10:41:04 UTC (rev 13701)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-10 11:05:11 UTC (rev 13702)
@@ -1695,7 +1695,7 @@
     HDSwitcherMenuNotificationGroup *ngroup;
     GHashTable *hints;
     GValue *hint;
-    gchar *summary, *body;
+    gchar *summary, *body, *icon_name;
     gboolean ack, icon_is_set = FALSE;
     gint id;
 
@@ -1742,6 +1742,7 @@
                           &iter,
                           HD_NM_COL_ID, &id,
                           HD_NM_COL_ICON, &icon,
+                          HD_NM_COL_ICON_NAME, &icon_name,
                           HD_NM_COL_SUMMARY, &summary,
                           HD_NM_COL_BODY, &body,
                           HD_NM_COL_HINTS, &hints,
@@ -1784,7 +1785,10 @@
         {
 	  switcher->priv->blinking_notification = id;
 
-          hd_switcher_menu_replace_blinking_icon (switcher, icon);
+          hd_switcher_menu_replace_blinking_icon (switcher, 
+			  			  hd_switcher_menu_get_icon_from_theme (switcher, 
+							  				icon_name,
+											AS_ICON_SIZE));
 
           icon_is_set = TRUE;
 	}
@@ -1792,6 +1796,10 @@
         if (!first_item)
 	  first_item = menu_item;
       }
+
+      g_free (icon_name);
+      g_free (summary);
+      g_free (body);
     }
     while (gtk_tree_model_iter_next (nm, &iter));
 
@@ -1969,7 +1977,7 @@
     GError *error = NULL;
 
     app_pixbuf = hd_wm_entry_info_get_app_icon (info,
-                                             AS_ICON_THUMB_SIZE,
+                                             AS_ICON_SIZE,
                                              &error);
     if (error)
     {
@@ -1978,7 +1986,7 @@
       
       app_pixbuf = gtk_icon_theme_load_icon (switcher->priv->icon_theme,
                                              AS_MENU_DEFAULT_APP_ICON,
-                                             AS_ICON_THUMB_SIZE,
+                                             AS_ICON_SIZE,
                                              GTK_ICON_LOOKUP_NO_SVG,
                                              &error);