comparison: finch/gntblist.c
finch/gntblist.c
- changeset 22342
- 916c989bd2c0
- parent 22341
- ed341c90116e
- child 22376
- 25a17b6b69c2
equal
deleted
inserted
replaced
| 22341:ed341c90116e | 22342:916c989bd2c0 |
|---|---|
| 261 | 261 |
| 262 g_string_append_printf(str, _("Online: %d\nTotal: %d"), | 262 g_string_append_printf(str, _("Online: %d\nTotal: %d"), |
| 263 purple_blist_get_group_online_count(group), | 263 purple_blist_get_group_online_count(group), |
| 264 purple_blist_get_group_size(group, FALSE)); | 264 purple_blist_get_group_size(group, FALSE)); |
| 265 | 265 |
| 266 title = g_strdup(group->name); | 266 title = g_strdup(purple_group_get_name(group)); |
| 267 } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { | 267 } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { |
| 268 PurpleChat *chat = (PurpleChat *)node; | 268 PurpleChat *chat = (PurpleChat *)node; |
| 269 PurpleAccount *account = purple_chat_get_account(chat); | 269 PurpleAccount *account = purple_chat_get_account(chat); |
| 270 | 270 |
| 271 g_string_append_printf(str, _("Account: %s (%s)"), | 271 g_string_append_printf(str, _("Account: %s (%s)"), |
| 682 purple_request_field_group_add_field(group, field); | 682 purple_request_field_group_add_field(group, field); |
| 683 | 683 |
| 684 field = purple_request_field_string_new("alias", _("Alias"), alias, FALSE); | 684 field = purple_request_field_string_new("alias", _("Alias"), alias, FALSE); |
| 685 purple_request_field_group_add_field(group, field); | 685 purple_request_field_group_add_field(group, field); |
| 686 | 686 |
| 687 field = purple_request_field_string_new("group", _("Group"), grp ? grp->name : NULL, FALSE); | 687 field = purple_request_field_string_new("group", _("Group"), grp ? purple_group_get_name(grp) : NULL, FALSE); |
| 688 purple_request_field_group_add_field(group, field); | 688 purple_request_field_group_add_field(group, field); |
| 689 | 689 |
| 690 field = purple_request_field_bool_new("autojoin", _("Auto-join"), FALSE); | 690 field = purple_request_field_bool_new("autojoin", _("Auto-join"), FALSE); |
| 691 purple_request_field_group_add_field(group, field); | 691 purple_request_field_group_add_field(group, field); |
| 692 | 692 |
| 822 name = purple_chat_get_name(chat); | 822 name = purple_chat_get_name(chat); |
| 823 | 823 |
| 824 strncpy(status, "~", sizeof(status) - 1); | 824 strncpy(status, "~", sizeof(status) - 1); |
| 825 } | 825 } |
| 826 else if (PURPLE_BLIST_NODE_IS_GROUP(node)) | 826 else if (PURPLE_BLIST_NODE_IS_GROUP(node)) |
| 827 return ((PurpleGroup*)node)->name; | 827 return purple_group_get_name((PurpleGroup*)node); |
| 828 | 828 |
| 829 snprintf(text, sizeof(text) - 1, "%s %s", status, name); | 829 snprintf(text, sizeof(text) - 1, "%s %s", status, name); |
| 830 | 830 |
| 831 return text; | 831 return text; |
| 832 } | 832 } |
| 1100 } | 1100 } |
| 1101 | 1101 |
| 1102 static void | 1102 static void |
| 1103 finch_add_buddy(PurpleBlistNode *selected, PurpleGroup *grp) | 1103 finch_add_buddy(PurpleBlistNode *selected, PurpleGroup *grp) |
| 1104 { | 1104 { |
| 1105 purple_blist_request_add_buddy(NULL, NULL, grp ? grp->name : NULL, NULL); | 1105 purple_blist_request_add_buddy(NULL, NULL, grp ? purple_group_get_name(grp) : NULL, NULL); |
| 1106 } | 1106 } |
| 1107 | 1107 |
| 1108 static void | 1108 static void |
| 1109 finch_add_group(PurpleBlistNode *selected, PurpleGroup *grp) | 1109 finch_add_group(PurpleBlistNode *selected, PurpleGroup *grp) |
| 1110 { | 1110 { |
| 1264 else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) | 1264 else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) |
| 1265 name = purple_buddy_get_contact_alias((PurpleBuddy*)node); | 1265 name = purple_buddy_get_contact_alias((PurpleBuddy*)node); |
| 1266 else if (PURPLE_BLIST_NODE_IS_CHAT(node)) | 1266 else if (PURPLE_BLIST_NODE_IS_CHAT(node)) |
| 1267 name = purple_chat_get_name((PurpleChat*)node); | 1267 name = purple_chat_get_name((PurpleChat*)node); |
| 1268 else if (PURPLE_BLIST_NODE_IS_GROUP(node)) | 1268 else if (PURPLE_BLIST_NODE_IS_GROUP(node)) |
| 1269 name = ((PurpleGroup*)node)->name; | 1269 name = purple_group_get_name((PurpleGroup*)node); |
| 1270 else | 1270 else |
| 1271 g_return_if_reached(); | 1271 g_return_if_reached(); |
| 1272 | 1272 |
| 1273 prompt = g_strdup_printf(_("Please enter the new name for %s"), name); | 1273 prompt = g_strdup_printf(_("Please enter the new name for %s"), name); |
| 1274 | 1274 |
| 1356 name = purple_buddy_get_name((PurpleBuddy*)node); | 1356 name = purple_buddy_get_name((PurpleBuddy*)node); |
| 1357 account = purple_buddy_get_account((PurpleBuddy*)node); | 1357 account = purple_buddy_get_account((PurpleBuddy*)node); |
| 1358 } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { | 1358 } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { |
| 1359 name = purple_chat_get_name((PurpleChat*)node); | 1359 name = purple_chat_get_name((PurpleChat*)node); |
| 1360 } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) { | 1360 } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) { |
| 1361 name = ((PurpleGroup*)node)->name; | 1361 name = purple_group_get_name((PurpleGroup*)node); |
| 1362 sec = _("Removing this group will also remove all the buddies in the group"); | 1362 sec = _("Removing this group will also remove all the buddies in the group"); |
| 1363 } | 1363 } |
| 1364 else | 1364 else |
| 1365 return; | 1365 return; |
| 1366 | 1366 |
| 1515 create_chat_menu(GNT_MENU(context), chat); | 1515 create_chat_menu(GNT_MENU(context), chat); |
| 1516 title = g_strdup(purple_chat_get_name(chat)); | 1516 title = g_strdup(purple_chat_get_name(chat)); |
| 1517 } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) { | 1517 } else if (PURPLE_BLIST_NODE_IS_GROUP(node)) { |
| 1518 PurpleGroup *group = (PurpleGroup *)node; | 1518 PurpleGroup *group = (PurpleGroup *)node; |
| 1519 create_group_menu(GNT_MENU(context), group); | 1519 create_group_menu(GNT_MENU(context), group); |
| 1520 title = g_strdup(group->name); | 1520 title = g_strdup(purple_group_get_name(group)); |
| 1521 } | 1521 } |
| 1522 | 1522 |
| 1523 append_extended_menu(GNT_MENU(context), node); | 1523 append_extended_menu(GNT_MENU(context), node); |
| 1524 | 1524 |
| 1525 /* These are common for everything */ | 1525 /* These are common for everything */ |
