diff options
author | Ted Gould <ted@gould.cx> | 2011-03-23 15:33:37 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-03-23 15:33:37 -0500 |
commit | 010b25c0606fb47675a89ee2f75d6c93148e988f (patch) | |
tree | 26425c5c3f5e5b2864927f47bccf50dd10f73d83 /src | |
parent | bf797a9104b3ff1183a3f70337d259da6ded095b (diff) | |
parent | 0ed45139028434cf85dfd935d861f640b318f1d3 (diff) | |
download | libayatana-appindicator-010b25c0606fb47675a89ee2f75d6c93148e988f.tar.gz libayatana-appindicator-010b25c0606fb47675a89ee2f75d6c93148e988f.tar.bz2 libayatana-appindicator-010b25c0606fb47675a89ee2f75d6c93148e988f.zip |
Import upstream version 0.3.0
Diffstat (limited to 'src')
-rw-r--r-- | src/app-indicator.c | 14 |
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); } |