Mercurial > pidgin

comparison libpurple/protocols/jabber/useravatar.c @ 26736:a0e48796defb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merging. I blame meld and the fact I didn't `mtn copy buddy.c useravatar.c`.
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Apr 2009 18:57:47 +0000
parents 80437c891f92
children 76de9455154c
comparison
equal deleted inserted replaced
26735:3912f55a1633 26736:a0e48796defb
31 31
32 static void update_buddy_metadata(JabberStream *js, const char *from, xmlnode *items); 32 static void update_buddy_metadata(JabberStream *js, const char *from, xmlnode *items);
33 33
34 void jabber_avatar_init(void) 34 void jabber_avatar_init(void)
35 { 35 {
36 jabber_pep_register_handler("avatar", NS_AVATAR_0_12_METADATA, 36 jabber_pep_register_handler(NS_AVATAR_0_12_METADATA,
37 update_buddy_metadata); 37 update_buddy_metadata);
38 38
39 jabber_add_feature("urn_avatarmeta", NS_AVATAR_1_1_METADATA, 39 jabber_add_feature(NS_AVATAR_1_1_METADATA,
40 jabber_pep_namespace_only_when_pep_enabled_cb); 40 jabber_pep_namespace_only_when_pep_enabled_cb);
41 jabber_add_feature("urn_avatardata", NS_AVATAR_1_1_DATA, 41 jabber_add_feature(NS_AVATAR_1_1_DATA,
42 jabber_pep_namespace_only_when_pep_enabled_cb); 42 jabber_pep_namespace_only_when_pep_enabled_cb);
43 43
44 jabber_pep_register_handler("urn_avatar", NS_AVATAR_1_1_METADATA, 44 jabber_pep_register_handler(NS_AVATAR_1_1_METADATA,
45 update_buddy_metadata); 45 update_buddy_metadata);
46 } 46 }
47 47
48 static void 48 static void
49 remove_avatar_0_12_nodes(JabberStream *js) 49 remove_avatar_0_12_nodes(JabberStream *js)