comparison: src/protocols/jabber/buddy.c
src/protocols/jabber/buddy.c
- changeset 11303
- 448b8bae1ca7
- parent 11183
- be87fe695c93
- child 11318
- 13fa1d5134f3
equal
deleted
inserted
replaced
| 11302:25694fe861b9 | 11303:448b8bae1ca7 |
|---|---|
| 358 void jabber_set_info(GaimConnection *gc, const char *info) | 358 void jabber_set_info(GaimConnection *gc, const char *info) |
| 359 { | 359 { |
| 360 JabberIq *iq; | 360 JabberIq *iq; |
| 361 JabberStream *js = gc->proto_data; | 361 JabberStream *js = gc->proto_data; |
| 362 xmlnode *vc_node; | 362 xmlnode *vc_node; |
| 363 const char *avatar_file = NULL; | 363 char *avatar_file = NULL; |
| 364 | 364 |
| 365 if(js->avatar_hash) | 365 if(js->avatar_hash) |
| 366 g_free(js->avatar_hash); | 366 g_free(js->avatar_hash); |
| 367 js->avatar_hash = NULL; | 367 js->avatar_hash = NULL; |
| 368 | 368 |
| 369 /* | 369 /* |
| 370 * Send only if there's actually any *information* to send | 370 * Send only if there's actually any *information* to send |
| 371 */ | 371 */ |
| 372 vc_node = xmlnode_from_str(info, -1); | 372 vc_node = xmlnode_from_str(info, -1); |
| 373 avatar_file = gaim_account_get_buddy_icon(gc->account); | 373 avatar_file == gaim_buddy_icons_get_full_path(gaim_account_get_buddy_icon(gc->account)); |
| 374 | 374 |
| 375 if(!vc_node && avatar_file) { | 375 if(!vc_node && avatar_file) { |
| 376 vc_node = xmlnode_new("vCard"); | 376 vc_node = xmlnode_new("vCard"); |
| 377 } | 377 } |
| 378 | 378 |
| 407 g_free(enc); | 407 g_free(enc); |
| 408 g_free(avatar_data); | 408 g_free(avatar_data); |
| 409 } else if (error != NULL) { | 409 } else if (error != NULL) { |
| 410 g_error_free(error); | 410 g_error_free(error); |
| 411 } | 411 } |
| 412 g_free(avatar_file); | |
| 412 | 413 |
| 413 iq = jabber_iq_new(js, JABBER_IQ_SET); | 414 iq = jabber_iq_new(js, JABBER_IQ_SET); |
| 414 xmlnode_insert_child(iq->node, vc_node); | 415 xmlnode_insert_child(iq->node, vc_node); |
| 415 jabber_iq_send(iq); | 416 jabber_iq_send(iq); |
| 416 } else { | 417 } else { |
