comparison libpurple/protocols/sametime/sametime.c @ 25823:051c29d275de

propagate from branch 'im.pidgin.pidgin' (head a2d611d8fe1aec7a7cc8d1837f1a4dceeadcb6eb) to branch 'im.pidgin.pidgin.next.minor' (head 21c0e3d598ce43b2ed1bf56a226310af8f527fb5)
author Richard Laager <rlaager@wiktel.com>
date Sat, 08 Nov 2008 19:26:40 +0000
parents 8aa7d8bcbc7d 6757bffb3d3a
children 9bdd3ab8087f
comparison
equal deleted inserted replaced
25822:12e258fb6f3c 25823:051c29d275de
4505 4505
4506 static void mw_prpl_add_buddy(PurpleConnection *gc, 4506 static void mw_prpl_add_buddy(PurpleConnection *gc,
4507 PurpleBuddy *buddy, 4507 PurpleBuddy *buddy,
4508 PurpleGroup *group) { 4508 PurpleGroup *group) {
4509 4509
4510 struct mwPurplePluginData *pd; 4510 struct mwPurplePluginData *pd = gc->proto_data;
4511 struct mwServiceResolve *srvc; 4511 struct mwServiceResolve *srvc;
4512 GList *query; 4512 GList *query;
4513 enum mwResolveFlag flags; 4513 enum mwResolveFlag flags;
4514 guint32 req; 4514 guint32 req;
4515
4516 BuddyAddData *data; 4515 BuddyAddData *data;
4517
4518 data = g_new0(BuddyAddData, 1);
4519 data->buddy = buddy;
4520 data->group = group;
4521
4522 pd = gc->proto_data;
4523 srvc = pd->srvc_resolve;
4524 4516
4525 /* catch external buddies. They won't be in the resolve service */ 4517 /* catch external buddies. They won't be in the resolve service */
4526 if(buddy_is_external(buddy)) { 4518 if(buddy_is_external(buddy)) {
4527 buddy_add(pd, buddy); 4519 buddy_add(pd, buddy);
4528 return; 4520 return;
4529 } 4521 }
4522
4523 data = g_new0(BuddyAddData, 1);
4524 data->buddy = buddy;
4525 data->group = group;
4526
4527 srvc = pd->srvc_resolve;
4530 4528
4531 query = g_list_prepend(NULL, (char *)purple_buddy_get_name(buddy)); 4529 query = g_list_prepend(NULL, (char *)purple_buddy_get_name(buddy));
4532 flags = mwResolveFlag_FIRST | mwResolveFlag_USERS; 4530 flags = mwResolveFlag_FIRST | mwResolveFlag_USERS;
4533 4531
4534 req = mwServiceResolve_resolve(srvc, query, flags, add_buddy_resolved, 4532 req = mwServiceResolve_resolve(srvc, query, flags, add_buddy_resolved,