diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-23 15:34:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-23 15:34:25 -0500 |
| commit | 2ad6b9073ccc6b614ed204cbbe7333d204fe0eee (patch) | |
| tree | 5aef4ef9aabe5e93f1804cff650b73990b66301a /src/app-indicator.c | |
| parent | 5b6331c3ff78cbe0d4f9a3d2940b6af8f4e58909 (diff) | |
| parent | 010b25c0606fb47675a89ee2f75d6c93148e988f (diff) | |
| download | libayatana-appindicator-2ad6b9073ccc6b614ed204cbbe7333d204fe0eee.tar.gz libayatana-appindicator-2ad6b9073ccc6b614ed204cbbe7333d204fe0eee.tar.bz2 libayatana-appindicator-2ad6b9073ccc6b614ed204cbbe7333d204fe0eee.zip | |
* New upstream release.
* Don't use GIcon with GtkStatusIcon (LP: #708118)
Diffstat (limited to 'src/app-indicator.c')
| -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); } |