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

[<rl...@us...>]

Revision: 16669
Author:   rlaager
Date:     2006-08-07 17:27:13 -0700 (Mon, 07 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16669&view=rev

Log Message:
-----------
Merge the change to this file from revision 16668.  The other changes were to QQ files, which don't exist on this branch.

Original commit message:
We have gaim_str_has_prefix() to use in place of g_str_has_prefix().

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

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/bonjour/jabber.c
Modified: branches/v2_0_0/src/protocols/bonjour/jabber.c
===================================================================
--- branches/v2_0_0/src/protocols/bonjour/jabber.c	2006-08-08 00:25:19 UTC (rev 16668)
+++ branches/v2_0_0/src/protocols/bonjour/jabber.c	2006-08-08 00:27:13 UTC (rev 16669)
@@ -359,7 +359,7 @@
 	 * using a magic string, but xmlnode won't play nice when just
 	 * parsing an end tag
 	 */
-	if (g_str_has_prefix(message, STREAM_END) || (closed_conversation == TRUE)) {
+	if (gaim_str_has_prefix(message, STREAM_END) || (closed_conversation == TRUE)) {
 		/* Close the socket, clear the watcher and free memory */
 		if (bb->conversation != NULL) {
 			close(bb->conversation->socket);


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