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/buddy.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/buddy.c')
| -rw-r--r-- | libpurple/buddy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libpurple/buddy.c b/libpurple/buddy.c index fdc1e669a9..81737c2550 100644 --- a/libpurple/buddy.c +++ b/libpurple/buddy.c @@ -436,7 +436,7 @@ purple_buddy_get_alias_only(PurpleBuddy *buddy) { const gchar * purple_buddy_get_contact_alias(PurpleBuddy *buddy) { PurpleBuddyPrivate *priv = NULL; - PurpleContact *c = NULL; + PurpleMetaContact *c = NULL; g_return_val_if_fail(PURPLE_IS_BUDDY(buddy), NULL); @@ -450,8 +450,8 @@ purple_buddy_get_contact_alias(PurpleBuddy *buddy) { /* The contact alias */ c = purple_buddy_get_contact(buddy); - if((c != NULL) && (purple_contact_get_alias(c) != NULL)) { - return purple_contact_get_alias(c); + if((c != NULL) && (purple_meta_contact_get_alias(c) != NULL)) { + return purple_meta_contact_get_alias(c); } /* The server alias */ @@ -610,15 +610,15 @@ purple_buddy_get_server_alias(PurpleBuddy *buddy) { return NULL; } -PurpleContact * +PurpleMetaContact * purple_buddy_get_contact(PurpleBuddy *buddy) { PurpleBlistNode *parent = NULL; g_return_val_if_fail(PURPLE_IS_BUDDY(buddy), NULL); parent = purple_blist_node_get_parent(PURPLE_BLIST_NODE(buddy)); - if(PURPLE_IS_CONTACT(parent)) { - return PURPLE_CONTACT(parent); + if(PURPLE_IS_META_CONTACT(parent)) { + return PURPLE_META_CONTACT(parent); } return NULL; @@ -660,7 +660,7 @@ purple_buddy_update_status(PurpleBuddy *buddy, PurpleStatus *old_status) { if(old_online != new_online) { PurpleBlistNode *cnode = NULL, *gnode = NULL; - PurpleContact *contact = NULL; + PurpleMetaContact *contact = NULL; PurpleCountingNode *contact_counter = NULL, *group_counter = NULL; gint delta = 0, limit = 0; @@ -678,7 +678,7 @@ purple_buddy_update_status(PurpleBuddy *buddy, PurpleStatus *old_status) { } cnode = purple_blist_node_get_parent(PURPLE_BLIST_NODE(buddy)); - contact = PURPLE_CONTACT(cnode); + contact = PURPLE_META_CONTACT(cnode); contact_counter = PURPLE_COUNTING_NODE(contact); gnode = purple_blist_node_get_parent(cnode); group_counter = PURPLE_COUNTING_NODE(gnode); @@ -702,7 +702,7 @@ purple_buddy_update_status(PurpleBuddy *buddy, PurpleStatus *old_status) { * because something, somewhere changed. Calling the stuff below * certainly won't hurt anything. Unless you're on a K6-2 300. */ - purple_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy)); + purple_meta_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy)); purple_blist_update_node(blist, PURPLE_BLIST_NODE(buddy)); } @@ -737,7 +737,7 @@ purple_buddy_get_group(PurpleBuddy *buddy) { g_return_val_if_fail(PURPLE_IS_BUDDY(buddy), NULL); contact = purple_blist_node_get_parent(PURPLE_BLIST_NODE(buddy)); - if(!PURPLE_IS_CONTACT(contact)) { + if(!PURPLE_IS_META_CONTACT(contact)) { return purple_blist_get_default_group(); } |