pidgin: af18689b: Allow incoming stanzas to match 'our acc...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: af18689b86389686230fc6ce83cbba52690ce0cb
Ancestor: 759a86b9bfec72b98a7a29cda269892f10c3480f
Author: darkrain42 at pidgin.im
Date: 2009-05-29T20:56:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/af18689b86389686230fc6ce83cbba52690ce0cb

Modified files:
        libpurple/protocols/jabber/jutil.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jutil.c	62eb7393041207741c117918064751c3dc1e256a
+++ libpurple/protocols/jabber/jutil.c	912799b76983833354a4420afc830bbb9b370f21
@@ -260,9 +260,10 @@ jabber_is_own_account(JabberStream *js, 
 	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;
 }