soc.2008.xmpp: f77de9f5: * jabber_caps_jabber_identity_compare() ...

tfar at soc.pidgin.im tfar at soc.pidgin.im
Sun Jun 22 15:17:37 EDT 2008


-----------------------------------------------------------------
Revision: f77de9f5b0ad1188e6d09263aa09aecf42effc10
Ancestor: 5ad56756716f6c7193dd37fe4cd1fffcdbe37cc8
Author: tfar at soc.pidgin.im
Date: 2008-06-22T18:30:12
Branch: im.pidgin.soc.2008.xmpp
URL: http://d.pidgin.im/viewmtn/revision/info/f77de9f5b0ad1188e6d09263aa09aecf42effc10

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

ChangeLog: 

* jabber_caps_jabber_identity_compare() compares xml:lang too, now.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/caps.c	4283d149172d8b482aefa8058cd91a1a4cecf92a
+++ libpurple/protocols/jabber/caps.c	8a55f614ad25914530c13954fb6af18fc077ae1a
@@ -569,12 +569,17 @@ static gint jabber_caps_jabber_identity_
 	const JabberIdentity *ac;
 	const JabberIdentity *bc;
 	gint cat_cmp;
+	gint typ_cmp;
 	
 	ac = a;
 	bc = b;
 	
 	if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) {
-		return strcmp(ac->type, bc->type);
+		if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) {
+			return strcmp(ac->lang, bc->lang);
+		} else {
+			return typ_cmp;
+		}
 	} else {
 		return cat_cmp;
 	}


More information about the Commits mailing list