Mercurial > pidgin
comparison libpurple/protocols/jabber/google.c @ 29277:b98519a42e53
propagate from branch 'im.pidgin.pidgin' (head 431618de0f30a6938f7e14d2d61ee5d7738acd59)
to branch 'im.pidgin.cpw.attention_ui' (head 152f22112dfd920caedfff2893c8ffd449c1083c)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 22:07:59 +0000 |
parents | 36c73d036026 8aa7d8bcbc7d |
children | ae24e54a5014 |
comparison
equal
deleted
inserted
replaced
29276:a0668fbf2483 | 29277:b98519a42e53 |
---|---|
281 xmlnode *query; | 281 xmlnode *query; |
282 xmlnode *item; | 282 xmlnode *item; |
283 xmlnode *group; | 283 xmlnode *group; |
284 PurpleBuddy *b; | 284 PurpleBuddy *b; |
285 JabberBuddy *jb; | 285 JabberBuddy *jb; |
286 const char *balias; | |
286 | 287 |
287 js = (JabberStream*)(gc->proto_data); | 288 js = (JabberStream*)(gc->proto_data); |
288 | 289 |
289 if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER) | 290 if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER) |
290 return; | 291 return; |
307 | 308 |
308 b = buddies->data; | 309 b = buddies->data; |
309 g = purple_buddy_get_group(b); | 310 g = purple_buddy_get_group(b); |
310 | 311 |
311 group = xmlnode_new_child(item, "group"); | 312 group = xmlnode_new_child(item, "group"); |
312 xmlnode_insert_data(group, g->name, -1); | 313 xmlnode_insert_data(group, purple_group_get_name(g), -1); |
313 | 314 |
314 buddies = buddies->next; | 315 buddies = buddies->next; |
315 } | 316 } |
316 | 317 |
318 balias = purple_buddy_get_local_buddy_alias(b); | |
317 xmlnode_set_attrib(item, "jid", who); | 319 xmlnode_set_attrib(item, "jid", who); |
318 xmlnode_set_attrib(item, "name", b->alias ? b->alias : ""); | 320 xmlnode_set_attrib(item, "name", balias ? balias : ""); |
319 xmlnode_set_attrib(item, "gr:t", "B"); | 321 xmlnode_set_attrib(item, "gr:t", "B"); |
320 xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); | 322 xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); |
321 xmlnode_set_attrib(query, "gr:ext", "2"); | 323 xmlnode_set_attrib(query, "gr:ext", "2"); |
322 | 324 |
323 jabber_iq_send(iq); | 325 jabber_iq_send(iq); |
346 JabberIq *iq; | 348 JabberIq *iq; |
347 xmlnode *query; | 349 xmlnode *query; |
348 xmlnode *item; | 350 xmlnode *item; |
349 xmlnode *group; | 351 xmlnode *group; |
350 PurpleBuddy *b; | 352 PurpleBuddy *b; |
353 const char *balias; | |
351 | 354 |
352 g_return_if_fail(gc != NULL); | 355 g_return_if_fail(gc != NULL); |
353 g_return_if_fail(who != NULL); | 356 g_return_if_fail(who != NULL); |
354 | 357 |
355 js = (JabberStream*)(gc->proto_data); | 358 js = (JabberStream*)(gc->proto_data); |
356 | 359 |
357 if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER) | 360 if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER) |
358 return; | 361 return; |
359 | 362 |
360 buddies = purple_find_buddies(js->gc->account, who); | 363 buddies = purple_find_buddies(purple_connection_get_account(js->gc), who); |
361 if(!buddies) | 364 if(!buddies) |
362 return; | 365 return; |
363 | 366 |
364 b = buddies->data; | 367 b = buddies->data; |
365 | 368 |
373 | 376 |
374 b = buddies->data; | 377 b = buddies->data; |
375 g = purple_buddy_get_group(b); | 378 g = purple_buddy_get_group(b); |
376 | 379 |
377 group = xmlnode_new_child(item, "group"); | 380 group = xmlnode_new_child(item, "group"); |
378 xmlnode_insert_data(group, g->name, -1); | 381 xmlnode_insert_data(group, purple_group_get_name(g), -1); |
379 | 382 |
380 buddies = buddies->next; | 383 buddies = buddies->next; |
381 } | 384 } |
382 | 385 |
386 balias = purple_buddy_get_local_buddy_alias(b); | |
383 xmlnode_set_attrib(item, "jid", who); | 387 xmlnode_set_attrib(item, "jid", who); |
384 xmlnode_set_attrib(item, "name", b->alias ? b->alias : ""); | 388 xmlnode_set_attrib(item, "name", balias ? balias : ""); |
385 xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); | 389 xmlnode_set_attrib(query, "xmlns:gr", "google:roster"); |
386 xmlnode_set_attrib(query, "gr:ext", "2"); | 390 xmlnode_set_attrib(query, "gr:ext", "2"); |
387 | 391 |
388 jabber_iq_send(iq); | 392 jabber_iq_send(iq); |
389 | 393 |