comparison: pidgin/gtkblist.c
pidgin/gtkblist.c
- changeset 21226
- a60b30c9eeb5
- parent 21225
- 32d8e16cb7a9
- child 21351
- 4c83d3121e8b
equal
deleted
inserted
replaced
| 21225:32d8e16cb7a9 | 21226:a60b30c9eeb5 |
|---|---|
| 522 if (i > 1) | 522 if (i > 1) |
| 523 { | 523 { |
| 524 char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); | 524 char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); |
| 525 purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " | 525 purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " |
| 526 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, | 526 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, |
| 527 PURPLE_REQUEST_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); | 527 "blist", merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); |
| 528 g_free(msg); | 528 g_free(msg); |
| 529 } else | 529 } else |
| 530 g_list_free(merges); | 530 g_list_free(merges); |
| 531 } | 531 } |
| 532 | 532 |
| 4323 text = g_hash_table_lookup(gtkblist->connection_errors, account); | 4323 text = g_hash_table_lookup(gtkblist->connection_errors, account); |
| 4324 | 4324 |
| 4325 enabled = purple_account_get_enabled(account, purple_core_get_ui()); | 4325 enabled = purple_account_get_enabled(account, purple_core_get_ui()); |
| 4326 purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2, | 4326 purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2, |
| 4327 account, NULL, NULL, | 4327 account, NULL, NULL, |
| 4328 PURPLE_REQUEST_HINT_ACCOUNT, account, 3, | 4328 "account", account, 3, |
| 4329 _("OK"), NULL, | 4329 _("OK"), NULL, |
| 4330 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), | 4330 _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), |
| 4331 enabled ? _("Connect") : _("Re-enable Account"), | 4331 enabled ? _("Connect") : _("Re-enable Account"), |
| 4332 enabled ? PURPLE_CALLBACK(purple_account_connect) : | 4332 enabled ? PURPLE_CALLBACK(purple_account_connect) : |
| 4333 PURPLE_CALLBACK(ce_enable_account_cb)); | 4333 PURPLE_CALLBACK(ce_enable_account_cb)); |
| 5785 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); | 5785 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); |
| 5786 | 5786 |
| 5787 gtkblist = PIDGIN_BLIST(purple_get_blist()); | 5787 gtkblist = PIDGIN_BLIST(purple_get_blist()); |
| 5788 | 5788 |
| 5789 data->window = gtk_dialog_new_with_buttons(_("Add Buddy"), | 5789 data->window = gtk_dialog_new_with_buttons(_("Add Buddy"), |
| 5790 gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_NO_SEPARATOR, | 5790 gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR, |
| 5791 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | 5791 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
| 5792 GTK_STOCK_ADD, GTK_RESPONSE_OK, | 5792 GTK_STOCK_ADD, GTK_RESPONSE_OK, |
| 5793 NULL); | 5793 NULL); |
| 5794 | 5794 |
| 5795 if (gtkblist) | 5795 if (gtkblist) |
| 6169 gtkblist = PIDGIN_BLIST(purple_get_blist()); | 6169 gtkblist = PIDGIN_BLIST(purple_get_blist()); |
| 6170 | 6170 |
| 6171 data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); | 6171 data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
| 6172 | 6172 |
| 6173 data->window = gtk_dialog_new_with_buttons(_("Add Chat"), | 6173 data->window = gtk_dialog_new_with_buttons(_("Add Chat"), |
| 6174 gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_NO_SEPARATOR, | 6174 gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR, |
| 6175 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | 6175 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
| 6176 GTK_STOCK_ADD, GTK_RESPONSE_OK, | 6176 GTK_STOCK_ADD, GTK_RESPONSE_OK, |
| 6177 NULL); | 6177 NULL); |
| 6178 | 6178 |
| 6179 if (gtkblist) | 6179 if (gtkblist) |
| 6285 _("Please enter the name of the group to be added."), | 6285 _("Please enter the name of the group to be added."), |
| 6286 NULL, FALSE, FALSE, NULL, | 6286 NULL, FALSE, FALSE, NULL, |
| 6287 _("Add"), G_CALLBACK(add_group_cb), | 6287 _("Add"), G_CALLBACK(add_group_cb), |
| 6288 _("Cancel"), NULL, | 6288 _("Cancel"), NULL, |
| 6289 NULL, NULL, NULL, | 6289 NULL, NULL, NULL, |
| 6290 PURPLE_REQUEST_HINT_BLIST, NULL); | 6290 "blist", NULL); |
| 6291 } | 6291 } |
| 6292 | 6292 |
| 6293 void | 6293 void |
| 6294 pidgin_blist_toggle_visibility() | 6294 pidgin_blist_toggle_visibility() |
| 6295 { | 6295 { |
