From 7f489865a78b866ce22627c3ac5fb224a8bec4d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 17:23:04 -0600 Subject: Changing the emblem to system-restart-panel --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/session-service.c b/src/session-service.c index 51a930a..7d21c38 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -620,7 +620,7 @@ restart_dir_changed (void) } else { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required...")); } - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "emblem-important"); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel"); } else { if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); -- cgit v1.2.3 From 3f28a83d87eeaea304b906c42e2b3f46822833f3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 17:38:33 -0600 Subject: Restart icon name. --- src/dbus-shared-names.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 41ac219..a6364b1 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -50,6 +50,6 @@ with this program. If not, see . #define RESTART_ITEM_ICON "restart-icon" #define ICON_DEFAULT "system-shutdown-panel" -#define ICON_RESTART "system-shutdown-panel" +#define ICON_RESTART "system-shutdown-panel-restart" #endif /* __DBUS_SHARED_NAMES_H__ */ -- cgit v1.2.3 From 4045ff049580248fdffa58a3b8c40bf4bef07682 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 21:08:15 -0600 Subject: Switching to building with GIcon so that we don't have to add an icon, we can use fallbacks. --- src/indicator-session.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/indicator-session.c b/src/indicator-session.c index 3349886..184a335 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -326,12 +326,14 @@ restart_property_change (DbusmenuMenuitem * item, const gchar * property, const } else if (g_strcmp0(property, RESTART_ITEM_ICON) == 0) { GtkWidget * image = gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(gmi)); + GIcon * gicon = g_themed_icon_new_with_default_fallbacks(g_value_get_string(value)); if (image == NULL) { - image = gtk_image_new_from_icon_name(g_value_get_string(value), GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_gicon(gicon, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), image); } else { - gtk_image_set_from_icon_name(GTK_IMAGE(image), g_value_get_string(value), GTK_ICON_SIZE_MENU); + gtk_image_set_from_gicon(GTK_IMAGE(image), gicon, GTK_ICON_SIZE_MENU); } + g_object_unref(G_OBJECT(gicon)); } return; -- cgit v1.2.3 From 70a0dc7cf431dd2c7d4faa7081cbd7ea637a825f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Mar 2010 21:23:35 -0600 Subject: Making sure that if we can't get the icon, we leave it alone. --- src/indicator-session.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/indicator-session.c b/src/indicator-session.c index 184a335..55579b9 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -167,6 +167,14 @@ indicator_session_finalize (GObject *object) static void icon_name_get_cb (DBusGProxy *proxy, char * OUT_name, GError *error, gpointer userdata) { + if (error != NULL) { + return; + } + + if (OUT_name == NULL || OUT_name[0] == '\0') { + return; + } + IndicatorSession * self = INDICATOR_SESSION(userdata); gtk_image_set_from_icon_name(self->status_image, OUT_name, GTK_ICON_SIZE_MENU); return; -- cgit v1.2.3