Merge lp:~charlesk/indicator-sync/lp-1054310 into lp:indicator-sync/12.10

[Charles Kerr]

[Lars Karlitski (larsu)]

Looks good, thanks.

review: Approve

=== modified file 'src/indicator/indicator-sync.c'
--- src/indicator/indicator-sync.c	2012-09-24 19:43:12 +0000
+++ src/indicator/indicator-sync.c	2012-10-03 05:50:26 +0000
@@ -481,9 +481,22 @@
 static void
 app_update_icon (DbusmenuMenuitem * mi, struct AppWidgets * w)
 {
-  const gchar * icon_name = dbusmenu_menuitem_property_get (mi, APPLICATION_MENUITEM_PROP_ICON);
+  GIcon * icon;
+  const gchar * str;
+  GError * error = NULL;
 
-  gtk_image_set_from_icon_name (GTK_IMAGE(w->icon), icon_name, GTK_ICON_SIZE_MENU);
+  str = dbusmenu_menuitem_property_get (mi, APPLICATION_MENUITEM_PROP_ICON);
+  icon = g_icon_new_for_string (str, &error);
+  if (error != NULL)
+    {
+      g_warning ("unable to load icon: %s", error->message);
+      g_error_free (error);
+    }
+  else
+    {
+      gtk_image_set_from_gicon (GTK_IMAGE(w->icon), icon, GTK_ICON_SIZE_MENU);
+      g_object_unref (icon);
+    }
 }
 
 static void
 
=== modified file 'src/service/app-menu-item.c'
--- src/service/app-menu-item.c	2012-09-17 05:18:18 +0000
+++ src/service/app-menu-item.c	2012-10-03 05:50:26 +0000
@@ -331,6 +331,25 @@
     {
       GIcon * icon = g_app_info_get_icon (app_info);
       iconstr = g_icon_to_string (icon);
+
+      /* if GAppInfo returned a themed but non-symbolic icon,
+         let's add the symbolic option here */
+      if (G_IS_THEMED_ICON(icon))
+        {
+          GThemedIcon * themed_icon = G_THEMED_ICON (icon);
+          const gchar * const * names = g_themed_icon_get_names (themed_icon);
+          if (g_strv_length((gchar**)names) == 1)
+            {
+              gchar * tmp = g_strdup_printf ("%s-symbolic", names[0]);
+              g_clear_object (&icon);
+              icon =  g_themed_icon_new_with_default_fallbacks (tmp);
+              g_free (tmp);
+              g_free (iconstr);
+              iconstr = g_icon_to_string (icon);
+            }
+        }
+
+      g_clear_object (&icon);
     }
 
   if (iconstr == NULL)