libappindicator

Merge lp:~ted/libappindicator/lp885080 into lp:libappindicator/0.5

  1. lp885080
  2. Merge into trunk.0.5
Proposed by Ted Gould
Status: Merged
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~ted/libappindicator/lp885080
Merge into: lp:libappindicator/0.5
Diff against target: 27 lines (+9/-1)
1 file modified
src/app-indicator.c (+9/-1)
To merge this branch: bzr merge lp:~ted/libappindicator/lp885080
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+95677@code.launchpad.net

Description of the change

Set the title and name on the status icon in fallback mode.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app-indicator.c'
2--- src/app-indicator.c 2012-01-31 04:51:10 +0000
3+++ src/app-indicator.c 2012-03-02 22:11:19 +0000
4@@ -897,6 +897,10 @@
5 if (oldtitle != NULL) {
6 g_free(oldtitle);
7 }
8+
9+ if (priv->status_icon != NULL) {
10+ gtk_status_icon_set_title(priv->status_icon, priv->title ? priv->title : "");
11+ }
12 break;
13 }
14 case PROP_LABEL_GUIDE: {
15@@ -1510,7 +1514,11 @@
16 {
17 GtkStatusIcon * icon = gtk_status_icon_new();
18
19- gtk_status_icon_set_title(icon, app_indicator_get_id(self));
20+ gtk_status_icon_set_name(icon, app_indicator_get_id(self));
21+ const gchar * title = app_indicator_get_title(self);
22+ if (title != NULL) {
23+ gtk_status_icon_set_title(icon, title);
24+ }
25
26 g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_STATUS,
27 G_CALLBACK(status_icon_status_wrapper), icon);

Subscribers

People subscribed via source and target branches