# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1243630606 0
# Node ID fd7dc5cc0310c2a6eebf537f387ba251606ea01b
# Parent  9c283917ecf7b335add99546a6516fc7244a688e
Allow incoming stanzas to match 'our account' if they come from our resource.

This makes little sense but is allowed by rfc3921 7.2 for roster pushes and
is what ejabberd 2.0.5 uses.

diff -r 9c283917ecf7 -r fd7dc5cc0310 libpurple/protocols/jabber/jutil.c
--- a/libpurple/protocols/jabber/jutil.c	Fri May 29 05:11:14 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Fri May 29 20:56:46 2009 +0000
@@ -260,9 +260,10 @@
 	if (!jid)
 		return FALSE;
 
-	equal = (g_str_equal(jid->node, js->user->node) &&
+	equal = (purple_strequal(jid->node, js->user->node) &&
 	         g_str_equal(jid->domain, js->user->domain) &&
-	         jid->resource == NULL);
+	         (jid->resource == NULL ||
+	             g_str_equal(jid->resource, js->user->resource)));
 	jabber_id_free(jid);
 	return equal;
 }