diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2022-09-22 20:25:37 -0500 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2022-09-22 20:25:37 -0500 |
| commit | 63659fe3076ecd63a35ade3e48db71c2f64b1199 (patch) | |
| tree | 473f4bf19b2dc553e12e6a4442fa6a6388afa1cc /libpurple/group.c | |
| parent | 67762f38918f90f4bc72ab287e51367baef8f78d (diff) | |
| download | pidgin-63659fe3076ecd63a35ade3e48db71c2f64b1199.tar.gz | |
Rename PurpleContact to PurpleMetaContact.
This is to help facilitate the new blist api that's still being designed but we
wanted to use this name for an object. A later review request will rename
contact.[ch] which was avoided for now as it would make the diff harder to read.
Testing Done:
Ran and verified that contacts showed up.
Reviewed at https://reviews.imfreedom.org/r/1770/
Diffstat (limited to 'libpurple/group.c')
| -rw-r--r-- | libpurple/group.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libpurple/group.c b/libpurple/group.c index 401bf568e3..435c81607a 100644 --- a/libpurple/group.c +++ b/libpurple/group.c @@ -67,7 +67,7 @@ GSList *purple_group_get_accounts(PurpleGroup *group) { if (PURPLE_IS_CHAT(cnode)) { if (!g_slist_find(l, purple_chat_get_account(PURPLE_CHAT(cnode)))) l = g_slist_append(l, purple_chat_get_account(PURPLE_CHAT(cnode))); - } else if (PURPLE_IS_CONTACT(cnode)) { + } else if (PURPLE_IS_META_CONTACT(cnode)) { for (bnode = cnode->child; bnode; bnode = bnode->next) { if (PURPLE_IS_BUDDY(bnode)) { if (!g_slist_find(l, purple_buddy_get_account(PURPLE_BUDDY(bnode)))) @@ -83,8 +83,8 @@ GSList *purple_group_get_accounts(PurpleGroup *group) { gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account) { PurpleBlistNode *cnode; for (cnode = ((PurpleBlistNode *)g)->child; cnode; cnode = cnode->next) { - if (PURPLE_IS_CONTACT(cnode)) { - if(purple_contact_on_account((PurpleContact *) cnode, account)) + if (PURPLE_IS_META_CONTACT(cnode)) { + if(purple_meta_contact_on_account((PurpleMetaContact *) cnode, account)) return TRUE; } else if (PURPLE_IS_CHAT(cnode)) { PurpleChat *chat = (PurpleChat *)cnode; @@ -137,11 +137,11 @@ void purple_group_set_name(PurpleGroup *source, const char *name) { while (child) { next = child->next; - if (PURPLE_IS_CONTACT(child)) { + if (PURPLE_IS_META_CONTACT(child)) { PurpleBlistNode *bnode; - purple_blist_add_contact((PurpleContact *)child, dest, prev); + purple_blist_add_contact((PurpleMetaContact *)child, dest, prev); for (bnode = child->child; bnode != NULL; bnode = bnode->next) { - purple_blist_add_buddy((PurpleBuddy *)bnode, (PurpleContact *)child, + purple_blist_add_buddy((PurpleBuddy *)bnode, (PurpleMetaContact *)child, NULL, bnode->prev); moved_buddies = g_list_append(moved_buddies, bnode); } @@ -166,7 +166,7 @@ void purple_group_set_name(PurpleGroup *source, const char *name) { /* Build a GList of all buddies in this group */ for (cnode = PURPLE_BLIST_NODE(source)->child; cnode != NULL; cnode = cnode->next) { - if (PURPLE_IS_CONTACT(cnode)) + if (PURPLE_IS_META_CONTACT(cnode)) for (bnode = cnode->child; bnode != NULL; bnode = bnode->next) moved_buddies = g_list_append(moved_buddies, bnode); } |