Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 12088:980c877bd238
[gaim-migrate @ 14385]
sf patch #1356873, from Will Thompson (resiak)
"gaim_find_buddys_group is a stupid name.
gaim_buddy_get_group is not a stupid name."
Way to think outside the box!
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 14 Nov 2005 22:41:52 +0000 |
parents | d854a6fc7b82 |
children | cbebda5f019c |
comparison
equal
deleted
inserted
replaced
12087:f30a6ad84aff | 12088:980c877bd238 |
---|---|
746 | 746 |
747 if (b == NULL) | 747 if (b == NULL) |
748 b = gaim_find_buddy(account, userinfo->sn); | 748 b = gaim_find_buddy(account, userinfo->sn); |
749 | 749 |
750 if (b != NULL) { | 750 if (b != NULL) { |
751 g = gaim_find_buddys_group(b); | 751 g = gaim_buddy_get_group(b); |
752 presence = gaim_buddy_get_presence(b); | 752 presence = gaim_buddy_get_presence(b); |
753 status = gaim_presence_get_active_status(presence); | 753 status = gaim_presence_get_active_status(presence); |
754 } | 754 } |
755 | 755 |
756 if (userinfo != NULL) | 756 if (userinfo != NULL) |
4377 GaimConnection *gc = data->gc; | 4377 GaimConnection *gc = data->gc; |
4378 | 4378 |
4379 if (g_list_find(gaim_connections_get_all(), gc)) { | 4379 if (g_list_find(gaim_connections_get_all(), gc)) { |
4380 OscarData *od = gc->proto_data; | 4380 OscarData *od = gc->proto_data; |
4381 GaimBuddy *buddy = gaim_find_buddy(gc->account, data->name); | 4381 GaimBuddy *buddy = gaim_find_buddy(gc->account, data->name); |
4382 GaimGroup *group = gaim_find_buddys_group(buddy); | 4382 GaimGroup *group = gaim_buddy_get_group(buddy); |
4383 if (buddy && group) { | 4383 if (buddy && group) { |
4384 gaim_debug_info("oscar", | 4384 gaim_debug_info("oscar", |
4385 "ssi: adding buddy %s to group %s\n", | 4385 "ssi: adding buddy %s to group %s\n", |
4386 buddy->name, group->name); | 4386 buddy->name, group->name); |
4387 aim_ssi_sendauthrequest(od->sess, data->name, msg ? msg : _("Please authorize me so I can add you to my buddy list.")); | 4387 aim_ssi_sendauthrequest(od->sess, data->name, msg ? msg : _("Please authorize me so I can add you to my buddy list.")); |
7779 if (!(b = gaim_find_buddy(gaim_connection_get_account(data->gc), data->name))) { | 7779 if (!(b = gaim_find_buddy(gaim_connection_get_account(data->gc), data->name))) { |
7780 oscar_free_name_data(data); | 7780 oscar_free_name_data(data); |
7781 return; | 7781 return; |
7782 } | 7782 } |
7783 | 7783 |
7784 if (!(g = gaim_find_buddys_group(b))) { | 7784 if (!(g = gaim_buddy_get_group(b))) { |
7785 oscar_free_name_data(data); | 7785 oscar_free_name_data(data); |
7786 return; | 7786 return; |
7787 } | 7787 } |
7788 | 7788 |
7789 aim_ssi_editcomment(od->sess, g->name, data->name, text); | 7789 aim_ssi_editcomment(od->sess, g->name, data->name, text); |
7811 gc = gaim_account_get_connection(buddy->account); | 7811 gc = gaim_account_get_connection(buddy->account); |
7812 od = gc->proto_data; | 7812 od = gc->proto_data; |
7813 | 7813 |
7814 data = g_new(struct name_data, 1); | 7814 data = g_new(struct name_data, 1); |
7815 | 7815 |
7816 if (!(g = gaim_find_buddys_group(buddy))) | 7816 if (!(g = gaim_buddy_get_group(buddy))) |
7817 return; | 7817 return; |
7818 comment = aim_ssi_getcomment(od->sess->ssi.local, g->name, buddy->name); | 7818 comment = aim_ssi_getcomment(od->sess->ssi.local, g->name, buddy->name); |
7819 comment_utf8 = comment ? gaim_utf8_try_convert(comment) : NULL; | 7819 comment_utf8 = comment ? gaim_utf8_try_convert(comment) : NULL; |
7820 | 7820 |
7821 data->gc = gc; | 7821 data->gc = gc; |