pidgin: a7573ae2: Use the purple_group_get_name() accessor...
andrew.victor at mxit.com
andrew.victor at mxit.com
Mon Oct 31 17:31:08 EDT 2011
----------------------------------------------------------------------
Revision: a7573ae2a07beb57452f4f40655052d783115e77
Parent: 138447ff2ff08dc4e651243969483a74259dd5a7
Author: andrew.victor at mxit.com
Date: 10/31/11 15:00:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a7573ae2a07beb57452f4f40655052d783115e77
Changelog:
Use the purple_group_get_name() accessor function.
Changes against parent 138447ff2ff08dc4e651243969483a74259dd5a7
patched pidgin/gtkblist.c
patched pidgin/gtkdialogs.c
-------------- next part --------------
============================================================
--- pidgin/gtkblist.c 04bedc56142989b75b1e0cd08e92587a1b503349
+++ pidgin/gtkblist.c f902310e3ed4f4b28baeaaa3c55c48c51713fcd0
@@ -2113,7 +2113,7 @@ add_buddies_from_vcard(const char *prpl_
for (l = list; l != NULL; l = l->next)
{
purple_blist_request_add_buddy(account, l->data,
- (group ? group->name : NULL),
+ (group ? purple_group_get_name(group) : NULL),
alias);
}
}
@@ -2535,7 +2535,7 @@ static void pidgin_blist_drag_data_rcv_c
else
{
purple_blist_request_add_buddy(account, username,
- (group ? group->name : NULL),
+ (group ? purple_group_get_name(group) : NULL),
alias);
}
}
@@ -6435,7 +6435,7 @@ static char *pidgin_get_group_title(Purp
text_color = selected ? NULL : theme_font_get_color_default(pair, NULL);
text_font = theme_font_get_face_default(pair, "");
- esc = g_markup_escape_text(group->name, -1);
+ esc = g_markup_escape_text(purple_group_get_name(group), -1);
if (text_color) {
mark = g_strdup_printf("<span foreground='%s' font_desc='%s'><b>%s</b>%s%s%s</span>",
text_color, text_font,
@@ -6909,7 +6909,6 @@ groups_tree(void)
groups_tree(void)
{
static GList *list = NULL;
- char *tmp2;
PurpleGroup *g;
PurpleBlistNode *gnode;
@@ -6929,8 +6928,7 @@ groups_tree(void)
if (PURPLE_BLIST_NODE_IS_GROUP(gnode))
{
g = (PurpleGroup *)gnode;
- tmp2 = g->name;
- list = g_list_append(list, tmp2);
+ list = g_list_append(list, (char *) purple_group_get_name(g));
}
}
}
@@ -7265,7 +7263,7 @@ pidgin_blist_request_add_chat(PurpleAcco
if (name != NULL)
gtk_widget_grab_focus(data->alias_entry);
- data->group_combo = pidgin_text_combo_box_entry_new(group ? group->name : NULL, groups_tree());
+ data->group_combo = pidgin_text_combo_box_entry_new(group ? purple_group_get_name(group) : NULL, groups_tree());
pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Group:"),
data->chat_data.rq_data.sg, data->group_combo,
TRUE, NULL);
============================================================
--- pidgin/gtkdialogs.c baf296c8c8bac5bdf52778337a465beead236e70
+++ pidgin/gtkdialogs.c 59e789688b7714eb7e9fd00359a1181a39d6bb85
@@ -1233,7 +1233,7 @@ pidgin_dialogs_merge_groups(PurpleGroup
text = g_strdup_printf(
_("You are about to merge the group called %s into the group "
- "called %s. Do you want to continue?"), source->name, new_name);
+ "called %s. Do you want to continue?"), purple_group_get_name(source), new_name);
ggp = g_new(struct _PidginGroupMergeObject, 1);
ggp->parent = source;
@@ -1293,7 +1293,7 @@ pidgin_dialogs_remove_group(PurpleGroup
g_return_if_fail(group != NULL);
text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"),
- group->name);
+ purple_group_get_name(group));
purple_request_action(group, NULL, _("Remove Group"), text, 0,
NULL, NULL, NULL,
More information about the Commits
mailing list