aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-03-02 16:03:37 -0600
committerTed Gould <ted@gould.cx>2012-03-02 16:03:37 -0600
commitfafea8adaeafdfb79e5a5df29433a9af0b199adc (patch)
tree1bfbe92646a2edf25abb4a7fa63836812213cb39 /src
parent002c16bd0b040dfb39468898eb904f035ea2b97c (diff)
downloadlibayatana-appindicator-fafea8adaeafdfb79e5a5df29433a9af0b199adc.tar.gz
libayatana-appindicator-fafea8adaeafdfb79e5a5df29433a9af0b199adc.tar.bz2
libayatana-appindicator-fafea8adaeafdfb79e5a5df29433a9af0b199adc.zip
Protecting from NULL titles, which apparently status_icon can't take :-/
Diffstat (limited to 'src')
-rw-r--r--src/app-indicator.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 92aae3b..f3d0b65 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -899,7 +899,7 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
}
if (priv->status_icon != NULL) {
- gtk_status_icon_set_title(priv->status_icon, priv->title);
+ gtk_status_icon_set_title(priv->status_icon, priv->title ? priv->title : "");
}
break;
}
@@ -1515,7 +1515,10 @@ fallback (AppIndicator * self)
GtkStatusIcon * icon = gtk_status_icon_new();
gtk_status_icon_set_name(icon, app_indicator_get_id(self));
- gtk_status_icon_set_title(icon, app_indicator_get_title(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);