[maemo-commits] [maemo-commits] r13306 - in projects/haf/trunk/hildon-desktop: . libhildondesktop libhildonwm src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-20 18:12:47 +0300 (Mon, 20 Aug 2007)
New Revision: 13306

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-08-20  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-desktop-notification-manager.c,
	libhildonwm/hd-wm-window.c: change default application/notification
	icon size to 40px. Fixes NB#64981.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-20 15:05:46 UTC (rev 13305)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-20 15:12:47 UTC (rev 13306)
@@ -1,5 +1,11 @@
 2007-08-20  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* libhildondesktop/hildon-desktop-notification-manager.c,
+	libhildonwm/hd-wm-window.c: change default application/notification
+	icon size to 40px. Fixes NB#64981.
+
+2007-08-20  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-switcher-menu-item.c (hd_switcher_menu_item_constructor):
 	increase padding around application/notification icon.
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c	2007-08-20 15:05:46 UTC (rev 13305)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c	2007-08-20 15:12:47 UTC (rev 13306)
@@ -244,7 +244,7 @@
 
       pixbuf = gtk_icon_theme_load_icon (icon_theme,
                                          icon_name,
-                                         32,
+                                         40,
                                          GTK_ICON_LOOKUP_NO_SVG,
 	                                 &error);
 

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c	2007-08-20 15:05:46 UTC (rev 13305)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-window.c	2007-08-20 15:12:47 UTC (rev 13306)
@@ -592,7 +592,7 @@
 
       hd_wm_debug("got w:%i, h:%im offset is %i\n", w, h, offset);
 
-      if (w == 26 && h == 26)
+      if (w == 40 && h == 40)
 	break;
 
       offset += ((w*h) + 2);

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-08-20 15:05:46 UTC (rev 13305)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-08-20 15:12:47 UTC (rev 13306)
@@ -347,11 +347,12 @@
 
   if (priv->info)
   { 
-    GdkPixbuf *app_pixbuf;
-      
+    GdkPixbuf *app_pixbuf = NULL;
+    
     priv->is_blinking = hd_wm_entry_info_is_urgent (priv->info);
+
     app_pixbuf = hd_wm_entry_info_get_icon (priv->info);
-    
+
     if (!app_pixbuf)
     {
       GError *error = NULL;
@@ -900,7 +901,7 @@
   		                      HDWMEntryInfo        *info)
 {
   HDSwitcherMenuItemPrivate *priv;
-  GdkPixbuf *pixbuf;
+  GdkPixbuf *pixbuf = NULL;
   
   g_return_if_fail (HD_IS_SWITCHER_MENU_ITEM (menuitem));
   g_return_if_fail (info != NULL);
@@ -908,24 +909,23 @@
   priv = menuitem->priv;
 
   priv->info = info;
-  
+
   pixbuf = hd_wm_entry_info_get_icon (priv->info);
   
   if (!pixbuf)
   {
     GError *error = NULL;
 
-
     pixbuf = hd_wm_entry_info_get_app_icon (priv->info,
                                            AS_ICON_THUMB_SIZE,
                                            &error);
+
     if (error)
     {
       g_warning ("Could not load icon %s from theme: %s.",
                  hd_wm_entry_info_get_app_icon_name (priv->info),
                  error->message);
           
-          
       g_clear_error (&error);
       
       pixbuf = gtk_icon_theme_load_icon (priv->icon_theme,

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-20 15:05:46 UTC (rev 13305)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-20 15:12:47 UTC (rev 13306)
@@ -2004,7 +2004,7 @@
       switcher->priv->last_urgent_info == info)	 /* application's one. Now we've been told to change it back*/
   {
     hd_switcher_menu_reset_main_icon (switcher);	  
-    switcher->priv->last_urgent_info = NULL;	  
+    switcher->priv->last_urgent_info = NULL;
   }	  
 
   if (hd_wm_entry_info_is_urgent (info) &&
@@ -2018,9 +2018,9 @@
 
       if (make_it_blink)
       {	      
-        hd_switcher_menu_replace_blinking_icon 
+        hd_switcher_menu_replace_blinking_icon
   	  (switcher, hd_switcher_get_default_icon_from_entry_info (switcher,info));
-	
+
 	switcher->priv->last_urgent_info = info;
       }
     }