ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/new-restart-icons into lp:indicator-session.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Changing the icon names to the ones specified by design and ensuring
that things fallback all nice like.
-- 
https://code.launchpad.net/~ted/indicator-session/new-restart-icons/+merge/21304
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/dbus-shared-names.h'
--- src/dbus-shared-names.h	2010-03-12 23:33:49 +0000
+++ src/dbus-shared-names.h	2010-03-13 04:25:21 +0000
@@ -50,6 +50,6 @@
 #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__ */

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2010-03-13 04:19:22 +0000
+++ src/indicator-session.c	2010-03-13 04:25:21 +0000
@@ -168,6 +168,14 @@
 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);
 	indicator_image_helper_update(self->status_image, OUT_name);
 	return;
@@ -327,12 +335,14 @@
 	} 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;

=== modified file 'src/session-service.c'
--- src/session-service.c	2010-03-12 23:33:49 +0000
+++ src/session-service.c	2010-03-13 04:25:21 +0000
@@ -622,7 +622,7 @@
 		} 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");
 		if (session_dbus != NULL) {
 			session_dbus_set_name(session_dbus, ICON_RESTART);
 		}