aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2009-02-11 04:52:40 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2009-02-11 04:52:40 +0800
commit56a359ea83d2fe6eba127edee7d55750a9089ed5 (patch)
tree226b7f93d55062ed3046107ee58af3980873f02a
parentfbb70703518055823582b7c751044faa5cbb3e3d (diff)
downloadgsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.tar
gsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.tar.gz
gsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.tar.bz2
gsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.tar.lz
gsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.tar.xz
gsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.tar.zst
gsoc2013-empathy-56a359ea83d2fe6eba127edee7d55750a9089ed5.zip
status_icon_update_tooltip: don't display the event message if NULL. Fixes bug #571184 (Guillaume Desmottes)
From: Guillaume Desmottes <gdesmott@gnome.org> git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2433 4ee84921-47dd-4033-b63a-18d7a039a3e4
-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) {