aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-23 15:07:58 -0500
committerTed Gould <ted@gould.cx>2011-03-23 15:07:58 -0500
commit8974a7fd846c4a93ff3b33928a63802fcd5b8c7d (patch)
tree47660c04a65f8092acada3d5e8b1df92fc58d0b5
parentf321aae0417acab6856e1e6f31b841a9b809c1c7 (diff)
parent54b25e3de6b798f95369fb659040f0bbf3ee8759 (diff)
downloadlibayatana-appindicator-8974a7fd846c4a93ff3b33928a63802fcd5b8c7d.tar.gz
libayatana-appindicator-8974a7fd846c4a93ff3b33928a63802fcd5b8c7d.tar.bz2
libayatana-appindicator-8974a7fd846c4a93ff3b33928a63802fcd5b8c7d.zip
Use icon-name instead of GIcon in the fallback GtkStatusIcon
-rw-r--r--src/app-indicator.c14
1 files 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);
}