ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/libindicator-image-helper into lp:indicator-session with lp:~ted/indicator-session/panel-icon-shows-restart as a prerequisite.

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


Use the libindicator image handler helpers.
-- 
https://code.launchpad.net/~ted/indicator-session/libindicator-image-helper/+merge/21294
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'configure.ac'
--- configure.ac	2010-03-04 18:16:23 +0000
+++ configure.ac	2010-03-12 22:42:15 +0000
@@ -26,7 +26,7 @@
 ###########################
 
 GTK_REQUIRED_VERSION=2.12
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.5
 DBUSMENUGTK_REQUIRED_VERSION=0.2.2
 POLKIT_REQUIRED_VERSION=0.92
 

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2010-03-12 22:42:15 +0000
+++ src/indicator-session.c	2010-03-12 22:42:15 +0000
@@ -32,6 +32,7 @@
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
 #include <libindicator/indicator-service-manager.h>
+#include <libindicator/indicator-image-helper.h>
 
 #include "dbus-shared-names.h"
 #include "dbusmenu-shared.h"
@@ -107,7 +108,7 @@
 	self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION);
 	g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(service_connection_cb), self);
 
-	self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name(ICON_DEFAULT, GTK_ICON_SIZE_MENU));
+	self->status_image = indicator_image_helper(ICON_DEFAULT);
 	self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT);
 
 	DbusmenuClient * client = DBUSMENU_CLIENT(dbusmenu_gtkmenu_get_client(self->menu));
@@ -162,7 +163,7 @@
 icon_name_get_cb (DBusGProxy *proxy, char * OUT_name, GError *error, gpointer userdata)
 {
 	IndicatorSession * self = INDICATOR_SESSION(userdata);
-	gtk_image_set_from_icon_name(self->status_image, OUT_name, GTK_ICON_SIZE_MENU);
+	indicator_image_helper_update(self->status_image, OUT_name);
 	return;
 }
 
@@ -174,7 +175,7 @@
 	if (connected) {
 		org_ayatana_indicator_session_service_get_icon_async(self->service_proxy, icon_name_get_cb, user_data);
 	} else {
-		gtk_image_set_from_icon_name(self->status_image, ICON_DEFAULT, GTK_ICON_SIZE_MENU);
+		indicator_image_helper_update(self->status_image, ICON_DEFAULT);
 	}
 
 	return;
@@ -190,7 +191,7 @@
 icon_changed (DBusGProxy * proxy, gchar * icon_name, gpointer user_data)
 {
 	IndicatorSession * session = INDICATOR_SESSION(user_data);
-	gtk_image_set_from_icon_name(session->status_image, icon_name, GTK_ICON_SIZE_MENU);
+	indicator_image_helper_update(session->status_image, icon_name);
 	return;
 }