Merge lp:~phurley/indicator-session/lp-957563 into lp:indicator-session/13.04

[Peter Hurley]

Use a list of icons to select appropriate system icon (LP: #975563)

[Mathieu Trudel-Lapierre (cyphermox)]

Seems far more complex and prone to omissions/special cases that another merge fixing the same issue: https://code.launchpad.net/~ballogy/indicator-session/better-fallback-icon/+merge/141608 (which however doesn't take care of retaining the fix for bug 1048348).

I'm sure there's a way to simplify this to not require a list of icons hard-coded in indicator-session -- perhaps by using the g_themed_icon_with_default_fallbacks mechanisms, and checking if it results in a valid icon, and dealing with when it doesn't?

review: Needs Fixing

[Peter Hurley (phurley)]

I reworked this branch to use g_themed_icon_new_from_names(). This removes some of the patch complexity (related to the poorly designed GtkIconTheme api).

[lp:~phurley/indicator-session/lp-957563]

381. By Peter Hurley on 2013-01-10

Use an ordered list to choose the appropriate system icon.
   The list is ordered by the following rules:
   1) Most unique names come first (ie, names least likely to exist in other themes)
   2) Themes with multiple matches require the desired icon name higher in the list
      than other possible matches.
   Fixes: https://bugs.launchpad.net/indicator-session/+bug/975563

   Preserves existing behavior: if the system menu's icon is missing in the current theme,
   fall back to gtk-missing-icon instead of showing no icon at all.
   Fixes: https://bugs.launchpad.net/bugs/1048348.

Unmerged revisions

381. By Peter Hurley on 2013-01-10

Use an ordered list to choose the appropriate system icon.
   The list is ordered by the following rules:
   1) Most unique names come first (ie, names least likely to exist in other themes)
   2) Themes with multiple matches require the desired icon name higher in the list
      than other possible matches.
   Fixes: https://bugs.launchpad.net/indicator-session/+bug/975563

   Preserves existing behavior: if the system menu's icon is missing in the current theme,
   fall back to gtk-missing-icon instead of showing no icon at all.
   Fixes: https://bugs.launchpad.net/bugs/1048348.

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2012-11-14 20:20:13 +0000
+++ src/indicator-session.c	2013-01-10 14:26:22 +0000
@@ -399,22 +399,24 @@
 indicator_session_update_icon_from_disposition (IndicatorSession * indicator,
                                                 int                disposition)
 {
-  const gchar * icon;
-
-  if (disposition == DISPOSITION_NORMAL)
-    icon = ICON_DEFAULT;
-  else if (disposition == DISPOSITION_INFO)
-    icon = ICON_INFO;
-  else
-    icon = ICON_ALERT;
-
-  if (gtk_icon_theme_has_icon (indicator->icon_theme, icon) == FALSE)
-    icon = "gtk-missing-image";
-
-  g_debug (G_STRLOC" setting icon to \"%s\"", icon);
-  gtk_image_set_from_icon_name (GTK_IMAGE(indicator->entry.image),
-                                icon,
-                                GTK_ICON_SIZE_BUTTON);
+  GIcon * gicon;
+  const char * icons[] = {  ICON_DEFAULT,           /* ubuntu-mono-*     */
+			    "system",               /* gnome & humanity  */
+			    "emblem-system",        /* HighContrast      */
+			    "system-shutdown",      /* others            */
+			    "gtk-missing-image",
+			    NULL,
+                         };
+
+  if (disposition == DISPOSITION_INFO)
+    icons[0] = ICON_INFO;
+  else if (disposition != DISPOSITION_NORMAL)
+    icons[0] = ICON_ALERT;
+
+  gicon = g_themed_icon_new_from_names ((char **) icons, -1);
+  gtk_image_set_from_gicon (GTK_IMAGE(indicator->entry.image),
+                            gicon,
+                            GTK_ICON_SIZE_BUTTON);
 }
   
 static int