[maemo-commits] [maemo-commits] r8408 - in projects/haf/trunk/maemo-af-desktop: . hildon-navigator

[From: www-data at stage.maemo.org]

Author: jobi
Date: 2006-11-28 16:40:11 +0200 (Tue, 28 Nov 2006)
New Revision: 8408

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-menu-item.c
Log:

2006-11-28  Johan Bilien <johan.bilien at nokia.com>

	* hildon-navigator/hn-app-menu-item.c,
	  hildon-navigator/hn-app-button.c: Fall back to default application
	  icon if not specified. Fixes: NB#47396



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-28 13:41:33 UTC (rev 8407)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-28 14:40:11 UTC (rev 8408)
@@ -1,3 +1,9 @@
+2006-11-28  Johan Bilien <johan.bilien at nokia.com>
+
+	* hildon-navigator/hn-app-menu-item.c,
+	  hildon-navigator/hn-app-button.c: Fall back to default application
+	  icon if not specified. Fixes: NB#47396
+
 2006-11-27  Johan Bilien <johan.bilien at nokia.com>
 
 	* configure.ac: added test on GTK+ for more fine-grained linking

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c	2006-11-28 13:41:33 UTC (rev 8407)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-button.c	2006-11-28 14:40:11 UTC (rev 8408)
@@ -1096,12 +1096,13 @@
 
   error = NULL;
   retval = hn_entry_info_get_app_icon (info, AS_ICON_SIZE, &error);
-  if (!error)
+  if (retval && !error)
     return retval;
 
-  osso_log (LOG_ERR, "Could not load icon '%s': %s\n",
-            hn_entry_info_get_app_icon_name (info),
-            error->message);
+  if (error && error->message)
+    osso_log (LOG_ERR, "Could not load icon '%s': %s\n",
+              hn_entry_info_get_app_icon_name (info),
+              error->message);
 
   /* Fallback to default icon */
   g_clear_error (&error);

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-menu-item.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-menu-item.c	2006-11-28 13:41:33 UTC (rev 8407)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-menu-item.c	2006-11-28 14:40:11 UTC (rev 8408)
@@ -315,6 +315,10 @@
                          error->message);
               g_error_free (error);
               error = NULL;
+            }
+
+          if (!app_pixbuf)
+            {
               app_pixbuf = gtk_icon_theme_load_icon (priv->icon_theme,
                                                      AS_MENU_DEFAULT_APP_ICON,
                                                      priv->thumbable ?