diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-18 20:38:46 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-21 10:25:30 +0800 |
| commit | d65218e07bdf9b63007c17315513e063d4c6e598 (patch) | |
| tree | 65a92ae3840b0888fdf1361792675eeb2561a07d /libempathy-gtk/empathy-chat.c | |
| parent | 9ebc1143eb2917b95ffd1922621c4d3971d2ac38 (diff) | |
| download | gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.tar gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.tar.gz gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.tar.bz2 gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.tar.lz gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.tar.xz gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.tar.zst gsoc2013-empathy-d65218e07bdf9b63007c17315513e063d4c6e598.zip | |
chat_send_error_cb: don't display the message if it's NULL
Diffstat (limited to 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index e25c8ff6f..986f84594 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1198,9 +1198,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); } |