Merge lp:~larsu/indicator-session/lp1048348 into lp:indicator-session/12.10

[Lars Karlitski]

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.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/11/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

"gtk-missing-image" makes more sense as a fallback than "system-shutdown", but otherwise looks good.

review: Needs Fixing

[lp:~larsu/indicator-session/lp1048348]

358. By Lars Karlitski on 2012-09-13

Change fallback icon to "gtk-missing-image"

[Lars Karlitski (larsu)]

Thought about it some more and agree with you. Changed it with r358.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:358
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/13/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2012-08-31 16:36:06 +0000
+++ src/indicator-session.c	2012-09-13 13:37:39 +0000
@@ -64,6 +64,7 @@
   GDBusProxy * service_proxy;
   GSettings * settings;
   DbusmenuClient * menu_client;
+  GtkIconTheme * icon_theme;
 };
 
 static gboolean greeter_mode;
@@ -84,6 +85,7 @@
                                     DbusmenuClient * client,
                                     gpointer user_data);
 static void on_menu_layout_updated (DbusmenuClient * client, IndicatorSession * session);
+static void indicator_session_update_icon_callback (GtkWidget * widget, gpointer callback_data);
 static void indicator_session_update_icon_and_a11y (IndicatorSession * self);
 static void indicator_session_update_users_label (IndicatorSession* self,
                                                   const gchar* name);
@@ -135,6 +137,13 @@
   self->entry.image = GTK_IMAGE (gtk_image_new());
   self->entry.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME,
                                                     INDICATOR_SESSION_DBUS_OBJECT));
+  /* We need to check if the current icon theme has the hard coded icons.
+   * If not, we'll fall back to a standard icon */
+  self->icon_theme = gtk_icon_theme_get_default();
+  g_signal_connect(G_OBJECT(self->icon_theme),
+                   "changed",
+                   G_CALLBACK(indicator_session_update_icon_callback), self);
+
   indicator_session_update_icon_and_a11y (self);
   g_settings_bind (self->settings, "show-real-name-on-panel",
                    self->entry.label, "visible",
@@ -478,6 +487,9 @@
         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,
@@ -515,6 +527,12 @@
 }
 
 static void
+indicator_session_update_icon_callback (GtkWidget * widget, gpointer callback_data)
+{
+  indicator_session_update_icon_and_a11y ((IndicatorSession *)callback_data);
+}
+
+static void
 indicator_session_update_icon_and_a11y (IndicatorSession * indicator)
 {
   const int disposition = calculate_disposition (indicator);