summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Markmann <tfar@soc.pidgin.im>2008-06-22 18:30:12 +0000
committerTobias Markmann <tfar@soc.pidgin.im>2008-06-22 18:30:12 +0000
commitb26f8b454c6110dc2a804262fb99ef5a72f1c1cc (patch)
treef959ab30fefae645e365ea4dd1f5ad37943c5e7e
parent8ed0c80163ad0cd705653ae4a43a0c56c3cceeb4 (diff)
downloadpidgin-b26f8b454c6110dc2a804262fb99ef5a72f1c1cc.tar.gz
* jabber_caps_jabber_identity_compare() compares xml:lang too, now.
-rw-r--r--libpurple/protocols/jabber/caps.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
index d8258bbe35..45d729cc00 100644
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -569,12 +569,17 @@ static gint jabber_caps_jabber_identity_compare(gconstpointer a, gconstpointer b
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;
}