[Gaim-commits] SF.net SVN: gaim: [16176] trunk/src/protocols/jabber/message.c

[<dat...@us...>]

Revision: 16176
Author:   datallah
Date:     2006-05-10 18:35:30 -0700 (Wed, 10 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16176&view=rev

Log Message:
-----------
Fix bug# 1464061.  I haven't fixed a bug in forever and I needed a break from my old house plumbing nightmares. It seems that some versions of ejabberd don't necessarily provide an error element and we should probably not crash when this happens.

Modified Paths:
--------------
    trunk/src/protocols/jabber/message.c
Modified: trunk/src/protocols/jabber/message.c
===================================================================
--- trunk/src/protocols/jabber/message.c	2006-05-10 17:33:51 UTC (rev 16175)
+++ trunk/src/protocols/jabber/message.c	2006-05-11 01:35:30 UTC (rev 16176)
@@ -231,7 +231,7 @@
 		return;
 
 	buf = g_strdup_printf(_("Message delivery to %s failed: %s"),
-			jm->from, jm->error);
+			jm->from, jm->error ? jm->error : "");
 
 	gaim_notify_formatted(jm->js->gc, _("Jabber Message Error"), _("Jabber Message Error"), buf,
 			jm->xhtml ? jm->xhtml : jm->body, NULL, NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.