# HG changeset patch # User Sadrul Habib Chowdhury # Date 1201407166 0 # Node ID 1f256f63c52c8d78f1dcebaed71a71f4ee27f436 # Parent 797230b3e48e42ca08d6639e644f6b69f1890af8 Update finch to not touch the internals of PurpleGroup. diff -r 797230b3e48e -r 1f256f63c52c finch/gntblist.c --- a/finch/gntblist.c Sun Jan 27 04:06:39 2008 +0000 +++ b/finch/gntblist.c Sun Jan 27 04:12:46 2008 +0000 @@ -263,7 +263,7 @@ purple_blist_get_group_online_count(group), purple_blist_get_group_size(group, FALSE)); - title = g_strdup(group->name); + title = g_strdup(purple_group_get_name(group)); } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { PurpleChat *chat = (PurpleChat *)node; PurpleAccount *account = purple_chat_get_account(chat); @@ -684,7 +684,7 @@ field = purple_request_field_string_new("alias", _("Alias"), alias, FALSE); purple_request_field_group_add_field(group, field); - field = purple_request_field_string_new("group", _("Group"), grp ? grp->name : NULL, FALSE); + field = purple_request_field_string_new("group", _("Group"), grp ? purple_group_get_name(grp) : NULL, FALSE); purple_request_field_group_add_field(group, field); field = purple_request_field_bool_new("autojoin", _("Auto-join"), FALSE); @@ -824,7 +824,7 @@ strncpy(status, "~", sizeof(status) - 1); } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) - return ((PurpleGroup*)node)->name; + return purple_group_get_name((PurpleGroup*)node); snprintf(text, sizeof(text) - 1, "%s %s", status, name); @@ -1102,7 +1102,7 @@ static void finch_add_buddy(PurpleBlistNode *selected, PurpleGroup *grp) { - purple_blist_request_add_buddy(NULL, NULL, grp ? grp->name : NULL, NULL); + purple_blist_request_add_buddy(NULL, NULL, grp ? purple_group_get_name(grp) : NULL, NULL); } static void @@ -1266,7 +1266,7 @@ else if (PURPLE_BLIST_NODE_IS_CHAT(node)) name = purple_chat_get_name((PurpleChat*)node); else if (PURPLE_BLIST_NODE_IS_GROUP(node)) - name = ((PurpleGroup*)node)->name; + name = purple_group_get_name((PurpleGroup*)node); else g_return_if_reached(); @@ -1358,7 +1358,7 @@ } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { name = purple_chat_get_name((PurpleChat*)node); } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) { - name = ((PurpleGroup*)node)->name; + name = purple_group_get_name((PurpleGroup*)node); sec = _("Removing this group will also remove all the buddies in the group"); } else @@ -1517,7 +1517,7 @@ } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) { PurpleGroup *group = (PurpleGroup *)node; create_group_menu(GNT_MENU(context), group); - title = g_strdup(group->name); + title = g_strdup(purple_group_get_name(group)); } append_extended_menu(GNT_MENU(context), node); diff -r 797230b3e48e -r 1f256f63c52c finch/gntrequest.c --- a/finch/gntrequest.c Sun Jan 27 04:06:39 2008 +0000 +++ b/finch/gntrequest.c Sun Jan 27 04:12:46 2008 +0000 @@ -427,7 +427,7 @@ for (node = purple_blist_get_root(); node; node = purple_blist_node_get_sibling_next(node)) { if (PURPLE_BLIST_NODE_IS_GROUP(node)) - gnt_entry_add_suggest(GNT_ENTRY(entry), ((PurpleGroup *)node)->name); + gnt_entry_add_suggest(GNT_ENTRY(entry), purple_group_get_name((PurpleGroup *)node)); } } return entry;