aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-09-30 16:38:11 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-09-30 16:38:11 +0200
commitf476076f2bc74a408f135895c9a6d7f96329bac0 (patch)
treed01672164c0b728f4891b8f329cd425de8522bc1
parent6ecd10fbb57cea400d59ad68da1d0fc602264c4e (diff)
downloadlibayatana-appindicator-f476076f2bc74a408f135895c9a6d7f96329bac0.tar.gz
libayatana-appindicator-f476076f2bc74a408f135895c9a6d7f96329bac0.tar.bz2
libayatana-appindicator-f476076f2bc74a408f135895c9a6d7f96329bac0.zip
unbreak attention_icon
-rw-r--r--src/app-indicator.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index c9e7ab9..21276c6 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -1523,21 +1523,30 @@ status_icon_changes (AppIndicator * self, gpointer data)
GtkStatusIcon * icon = GTK_STATUS_ICON(data);
gchar *longname = NULL;
- /* set longname only if its actually in the icon theme */
- longname = append_panel_icon_suffix(app_indicator_get_icon(self));
- if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname))
- gtk_status_icon_set_from_icon_name(icon, longname);
- else
- gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
-
switch (app_indicator_get_status(self)) {
case APP_INDICATOR_STATUS_PASSIVE:
+ longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname))
+ gtk_status_icon_set_from_icon_name(icon, longname);
+ else
+ gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
gtk_status_icon_set_visible(icon, FALSE);
break;
case APP_INDICATOR_STATUS_ACTIVE:
+ longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname))
+ gtk_status_icon_set_from_icon_name(icon, longname);
+ else
+ gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
gtk_status_icon_set_visible(icon, TRUE);
break;
case APP_INDICATOR_STATUS_ATTENTION:
+ /* get the _attention_ icon here */
+ longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self));
+ if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname))
+ gtk_status_icon_set_from_icon_name(icon, longname);
+ else
+ gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
gtk_status_icon_set_visible(icon, TRUE);
break;
};