[Gaim-commits] SF.net SVN: gaim: [16409] branches/v2_0_0/src/protocols/bonjour

[<the...@us...>]

Revision: 16409
Author:   thekingant
Date:     2006-07-02 18:40:12 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16409&view=rev

Log Message:
-----------
Backport SVN revision  #16408 from HEAD to v2_0_0
Original commit message:

Get rid of an assertion failure that I hit

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16408&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/bonjour/bonjour.c
    branches/v2_0_0/src/protocols/bonjour/jabber.c
Modified: branches/v2_0_0/src/protocols/bonjour/bonjour.c
===================================================================
--- branches/v2_0_0/src/protocols/bonjour/bonjour.c	2006-07-03 01:39:51 UTC (rev 16408)
+++ branches/v2_0_0/src/protocols/bonjour/bonjour.c	2006-07-03 01:40:12 UTC (rev 16409)
@@ -556,7 +556,7 @@
 #endif
 
 	/* Try to figure out a good host name to use */
-	/* TODO: Avoiding 'localhost,' if possible */
+	/* TODO: Avoid 'localhost,' if possible */
 	if (gethostname(hostname, 255) != 0) {
 		gaim_debug_warning("bonjour", "Error %d when getting host name.  Using \"localhost.\"\n", errno);
 		strcpy(hostname, "localhost");

Modified: branches/v2_0_0/src/protocols/bonjour/jabber.c
===================================================================
--- branches/v2_0_0/src/protocols/bonjour/jabber.c	2006-07-03 01:39:51 UTC (rev 16408)
+++ branches/v2_0_0/src/protocols/bonjour/jabber.c	2006-07-03 01:40:12 UTC (rev 16409)
@@ -379,7 +379,8 @@
 		_jabber_parse_and_write_message_to_ui(message, account->gc, gb);
 	}
 
-	xmlnode_free(message_node);
+	if (message_node != NULL)
+		xmlnode_free(message_node);
 }
 
 static void


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