From 54b25e3de6b798f95369fb659040f0bbf3ee8759 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Mar 2011 12:30:14 -0500 Subject: Set gtk_status_icon using icon_name instead of gicon --- src/app-indicator.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 347e168..cc785ca 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1471,34 +1471,26 @@ static void status_icon_changes (AppIndicator * self, gpointer data) { GtkStatusIcon * icon = GTK_STATUS_ICON(data); - GIcon *themed_icon = NULL; gchar *longname = NULL; switch (app_indicator_get_status(self)) { case APP_INDICATOR_STATUS_PASSIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - themed_icon = g_themed_icon_new_with_default_fallbacks (longname); gtk_status_icon_set_visible(icon, FALSE); - gtk_status_icon_set_from_gicon(icon, themed_icon); + gtk_status_icon_set_from_icon_name(icon, longname); break; case APP_INDICATOR_STATUS_ACTIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - themed_icon = g_themed_icon_new_with_default_fallbacks (longname); - gtk_status_icon_set_from_gicon(icon, themed_icon); + gtk_status_icon_set_from_icon_name(icon, longname); gtk_status_icon_set_visible(icon, TRUE); break; case APP_INDICATOR_STATUS_ATTENTION: longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self)); - themed_icon = g_themed_icon_new_with_default_fallbacks (longname); - gtk_status_icon_set_from_gicon(icon, themed_icon); + gtk_status_icon_set_from_icon_name(icon, longname); gtk_status_icon_set_visible(icon, TRUE); break; }; - if (themed_icon) { - g_object_unref (themed_icon); - } - if (longname) { g_free(longname); } -- cgit v1.2.3 From 0ed45139028434cf85dfd935d861f640b318f1d3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Mar 2011 15:08:56 -0500 Subject: 0.3.0 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e8b1d6c..360df06 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.99, ted@canonical.com) +AC_INIT(libappindicator, 0.3.0, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.99) +AM_INIT_AUTOMAKE(libappindicator, 0.3.0) AM_MAINTAINER_MODE -- cgit v1.2.3