diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-03-07 07:44:01 -0600 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-03-07 07:44:01 -0600 |
commit | 328e55e2a006ca560deaf921b4017f07c4ef41f6 (patch) | |
tree | dd3ed0fcc1eae83c53a719753092256546f7b448 /src/app-indicator.c | |
parent | b5874028638ac260b9783ec63ad307a042cac7ee (diff) | |
parent | fafea8adaeafdfb79e5a5df29433a9af0b199adc (diff) | |
download | libayatana-appindicator-328e55e2a006ca560deaf921b4017f07c4ef41f6.tar.gz libayatana-appindicator-328e55e2a006ca560deaf921b4017f07c4ef41f6.tar.bz2 libayatana-appindicator-328e55e2a006ca560deaf921b4017f07c4ef41f6.zip |
Merge lp:~ted/libappindicator/lp885080 to add a title and name on the status icon in fallback mode for bug #885080
Diffstat (limited to 'src/app-indicator.c')
-rw-r--r-- | src/app-indicator.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c index 8c78529..d7b3d18 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -897,6 +897,10 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu if (oldtitle != NULL) { g_free(oldtitle); } + + if (priv->status_icon != NULL) { + gtk_status_icon_set_title(priv->status_icon, priv->title ? priv->title : ""); + } break; } case PROP_LABEL_GUIDE: { @@ -1510,7 +1514,11 @@ fallback (AppIndicator * self) { GtkStatusIcon * icon = gtk_status_icon_new(); - gtk_status_icon_set_title(icon, app_indicator_get_id(self)); + gtk_status_icon_set_name(icon, app_indicator_get_id(self)); + const gchar * title = app_indicator_get_title(self); + if (title != NULL) { + gtk_status_icon_set_title(icon, title); + } g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_STATUS, G_CALLBACK(status_icon_status_wrapper), icon); |