aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2009-02-11 04:52:40 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-11 04:52:40 +0800
commit13cbc20f0333cb1a59cf5964d82e5bca363ecea2 (patch)
tree226b7f93d55062ed3046107ee58af3980873f02a /src
parent1cfcab42033de14bfd286a54dbc6d224e534ad27 (diff)
downloadgsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.tar
gsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.tar.gz
gsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.tar.bz2
gsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.tar.lz
gsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.tar.xz
gsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.tar.zst
gsoc2013-empathy-13cbc20f0333cb1a59cf5964d82e5bca363ecea2.zip
status_icon_update_tooltip: don't display the event message if NULL. Fixes bug #571184 (Guillaume Desmottes)
From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2433
Diffstat (limited to 'src')
-rw-r--r--src/empathy-status-icon.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 97eab7c29..492c37a85 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -170,9 +170,12 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon)
gchar *tooltip = NULL;
if (priv->event) {
- tooltip = g_strdup_printf ("%s\n%s",
- priv->event->header,
- priv->event->message);
+ if (priv->event->message != NULL)
+ tooltip = g_strdup_printf ("%s\n%s",
+ priv->event->header,
+ priv->event->message);
+ else
+ tooltip = g_strdup (priv->event->header);
}
if (!tooltip) {