From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 7 Aug 2009 11:21:08 +0000 (+0100)
Subject: status_icon_update_notification: don't crash if event->message is NULL
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=ec6cebc3342d4b8777f690df0f687fc00d3d7122

status_icon_update_notification: don't crash if event->message is NULL

g_markup_escape_text isn't NULL-safe so we should be sure that
event->message is not NULL before calling it.
---

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 79e59c5f..bbb97f41 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -138,7 +138,10 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 	}
 
 	if (priv->event) {
-		gchar *message_esc = g_markup_escape_text (priv->event->message, -1);
+		gchar *message_esc = NULL;
+
+		if (priv->event->message != NULL)
+			message_esc = g_markup_escape_text (priv->event->message, -1);
 
 		if (priv->notification) {
 			notify_notification_update (priv->notification,