From 92ff1b9177bd6d8633b8d92357e5081db0e9554f Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 18 Apr 2011 14:38:46 +0200 Subject: chat_send_error_cb: don't display the message if it's NULL --- libempathy-gtk/empathy-chat.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index b7c5192a8..2d906b0f4 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1295,9 +1295,14 @@ chat_send_error_cb (EmpathyTpChat *tp_chat, break; } - str = g_strdup_printf (_("Error sending message '%s': %s"), - message_body, - error); + if (message_body != NULL) { + str = g_strdup_printf (_("Error sending message '%s': %s"), + message_body, error); + } + else { + str = g_strdup_printf (_("Error sending message: %s"), error); + } + empathy_chat_view_append_event (chat->view, str); g_free (str); } -- cgit v1.2.3