Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/useravatar.c @ 29896:93e8e6331d44
jabber: Allow jabber_pep_request_item() to take NULL for JID; server's routing takes care of the rest
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 27 Feb 2010 04:02:50 +0000 |
parents | e14402d6c5e0 |
children | 9f59abd49def |
comparison
equal
deleted
inserted
replaced
29889:0d3151a41134 | 29896:93e8e6331d44 |
---|---|
237 } | 237 } |
238 } | 238 } |
239 | 239 |
240 void jabber_avatar_fetch_mine(JabberStream *js) | 240 void jabber_avatar_fetch_mine(JabberStream *js) |
241 { | 241 { |
242 char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain); | |
243 | |
244 if (js->initial_avatar_hash) { | 242 if (js->initial_avatar_hash) { |
245 jabber_pep_request_item(js, jid, NS_AVATAR_0_12_METADATA, NULL, | 243 jabber_pep_request_item(js, NULL, NS_AVATAR_0_12_METADATA, NULL, |
246 do_got_own_avatar_0_12_cb); | 244 do_got_own_avatar_0_12_cb); |
247 jabber_pep_request_item(js, jid, NS_AVATAR_1_1_METADATA, NULL, | 245 jabber_pep_request_item(js, NULL, NS_AVATAR_1_1_METADATA, NULL, |
248 do_got_own_avatar_cb); | 246 do_got_own_avatar_cb); |
249 } | 247 } |
250 | |
251 g_free(jid); | |
252 } | 248 } |
253 | 249 |
254 typedef struct _JabberBuddyAvatarUpdateURLInfo { | 250 typedef struct _JabberBuddyAvatarUpdateURLInfo { |
255 JabberStream *js; | 251 JabberStream *js; |
256 char *from; | 252 char *from; |