Mercurial > pidgin
comparison pidgin/gtkblist.c @ 32346:2fdc668362f0
Use the purple_group_get_name() accessor function.
author | andrew.victor@mxit.com |
---|---|
date | Mon, 31 Oct 2011 19:00:39 +0000 |
parents | b6276b10cb10 |
children | 76096c42f558 |
comparison
equal
deleted
inserted
replaced
32345:e323c2f84872 | 32346:2fdc668362f0 |
---|---|
2111 if (account != NULL) | 2111 if (account != NULL) |
2112 { | 2112 { |
2113 for (l = list; l != NULL; l = l->next) | 2113 for (l = list; l != NULL; l = l->next) |
2114 { | 2114 { |
2115 purple_blist_request_add_buddy(account, l->data, | 2115 purple_blist_request_add_buddy(account, l->data, |
2116 (group ? group->name : NULL), | 2116 (group ? purple_group_get_name(group) : NULL), |
2117 alias); | 2117 alias); |
2118 } | 2118 } |
2119 } | 2119 } |
2120 | 2120 |
2121 g_list_foreach(list, (GFunc)g_free, NULL); | 2121 g_list_foreach(list, (GFunc)g_free, NULL); |
2533 "can add that buddy."), NULL); | 2533 "can add that buddy."), NULL); |
2534 } | 2534 } |
2535 else | 2535 else |
2536 { | 2536 { |
2537 purple_blist_request_add_buddy(account, username, | 2537 purple_blist_request_add_buddy(account, username, |
2538 (group ? group->name : NULL), | 2538 (group ? purple_group_get_name(group) : NULL), |
2539 alias); | 2539 alias); |
2540 } | 2540 } |
2541 } | 2541 } |
2542 | 2542 |
2543 g_free(username); | 2543 g_free(username); |
6433 | 6433 |
6434 | 6434 |
6435 text_color = selected ? NULL : theme_font_get_color_default(pair, NULL); | 6435 text_color = selected ? NULL : theme_font_get_color_default(pair, NULL); |
6436 text_font = theme_font_get_face_default(pair, ""); | 6436 text_font = theme_font_get_face_default(pair, ""); |
6437 | 6437 |
6438 esc = g_markup_escape_text(group->name, -1); | 6438 esc = g_markup_escape_text(purple_group_get_name(group), -1); |
6439 if (text_color) { | 6439 if (text_color) { |
6440 mark = g_strdup_printf("<span foreground='%s' font_desc='%s'><b>%s</b>%s%s%s</span>", | 6440 mark = g_strdup_printf("<span foreground='%s' font_desc='%s'><b>%s</b>%s%s%s</span>", |
6441 text_color, text_font, | 6441 text_color, text_font, |
6442 esc ? esc : "", | 6442 esc ? esc : "", |
6443 !expanded ? " <span weight='light'>(</span>" : "", | 6443 !expanded ? " <span weight='light'>(</span>" : "", |
6907 | 6907 |
6908 static GList * | 6908 static GList * |
6909 groups_tree(void) | 6909 groups_tree(void) |
6910 { | 6910 { |
6911 static GList *list = NULL; | 6911 static GList *list = NULL; |
6912 char *tmp2; | |
6913 PurpleGroup *g; | 6912 PurpleGroup *g; |
6914 PurpleBlistNode *gnode; | 6913 PurpleBlistNode *gnode; |
6915 | 6914 |
6916 g_list_free(list); | 6915 g_list_free(list); |
6917 list = NULL; | 6916 list = NULL; |
6927 gnode = gnode->next) | 6926 gnode = gnode->next) |
6928 { | 6927 { |
6929 if (PURPLE_BLIST_NODE_IS_GROUP(gnode)) | 6928 if (PURPLE_BLIST_NODE_IS_GROUP(gnode)) |
6930 { | 6929 { |
6931 g = (PurpleGroup *)gnode; | 6930 g = (PurpleGroup *)gnode; |
6932 tmp2 = g->name; | 6931 list = g_list_append(list, (char *) purple_group_get_name(g)); |
6933 list = g_list_append(list, tmp2); | |
6934 } | 6932 } |
6935 } | 6933 } |
6936 } | 6934 } |
6937 | 6935 |
6938 return list; | 6936 return list; |
7263 data->chat_data.rq_data.sg, data->alias_entry, | 7261 data->chat_data.rq_data.sg, data->alias_entry, |
7264 TRUE, NULL); | 7262 TRUE, NULL); |
7265 if (name != NULL) | 7263 if (name != NULL) |
7266 gtk_widget_grab_focus(data->alias_entry); | 7264 gtk_widget_grab_focus(data->alias_entry); |
7267 | 7265 |
7268 data->group_combo = pidgin_text_combo_box_entry_new(group ? group->name : NULL, groups_tree()); | 7266 data->group_combo = pidgin_text_combo_box_entry_new(group ? purple_group_get_name(group) : NULL, groups_tree()); |
7269 pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Group:"), | 7267 pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Group:"), |
7270 data->chat_data.rq_data.sg, data->group_combo, | 7268 data->chat_data.rq_data.sg, data->group_combo, |
7271 TRUE, NULL); | 7269 TRUE, NULL); |
7272 | 7270 |
7273 data->autojoin = gtk_check_button_new_with_mnemonic(_("Auto_join when account connects.")); | 7271 data->autojoin = gtk_check_button_new_with_mnemonic(_("Auto_join when account connects.")); |