diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-12 22:19:22 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-12 22:19:22 -0600 |
| commit | dc699314c8b6bb0fec1ddd51c7128bc9505c6e85 (patch) | |
| tree | 6be2074899b5004355883808960d440dd1ebf140 | |
| parent | 2681e6476dbf2f0373c8791295f6dafd9d7158a1 (diff) | |
| parent | b419d049e7fe398e52739183f26cd486b7d9c421 (diff) | |
| download | ayatana-indicator-session-dc699314c8b6bb0fec1ddd51c7128bc9505c6e85.tar.gz ayatana-indicator-session-dc699314c8b6bb0fec1ddd51c7128bc9505c6e85.tar.bz2 ayatana-indicator-session-dc699314c8b6bb0fec1ddd51c7128bc9505c6e85.zip | |
Use the libindicator image helper to get fallbacks and nicer icons.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/indicator-session.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f79fa93..da38826 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ########################### 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 diff --git a/src/indicator-session.c b/src/indicator-session.c index 3349886..4ae9c66 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -36,6 +36,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #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" @@ -112,7 +113,7 @@ indicator_session_init (IndicatorSession *self) 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)); @@ -168,7 +169,7 @@ static void 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; } @@ -180,7 +181,7 @@ service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointe 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; @@ -196,7 +197,7 @@ static void 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; } |