comparison: pidgin/gtkprivacy.c
pidgin/gtkprivacy.c
- changeset 21171
- c6934783d152
- parent 20685
- 039aef89faf6
- child 21174
- 8ba833993a11
equal
deleted
inserted
replaced
| 21170:dca0f95d34ec | 21171:c6934783d152 |
|---|---|
| 552 data->account = account; | 552 data->account = account; |
| 553 data->name = g_strdup(name); | 553 data->name = g_strdup(name); |
| 554 data->block = FALSE; | 554 data->block = FALSE; |
| 555 | 555 |
| 556 if (name == NULL) { | 556 if (name == NULL) { |
| 557 purple_request_input_with_hint(account, _("Permit User"), | 557 purple_request_input(account, _("Permit User"), |
| 558 _("Type a user you permit to contact you."), | 558 _("Type a user you permit to contact you."), |
| 559 _("Please enter the name of the user you wish to be " | 559 _("Please enter the name of the user you wish to be " |
| 560 "able to contact you."), | 560 "able to contact you."), |
| 561 NULL, FALSE, FALSE, NULL, | 561 NULL, FALSE, FALSE, NULL, |
| 562 _("_Permit"), G_CALLBACK(add_permit_block_cb), | 562 _("_Permit"), G_CALLBACK(add_permit_block_cb), |
| 563 _("Cancel"), G_CALLBACK(destroy_request_data), | 563 _("Cancel"), G_CALLBACK(destroy_request_data), |
| 564 account, name, NULL, | 564 account, name, NULL, |
| 565 "privacy", data); | 565 data); |
| 566 } | 566 } |
| 567 else { | 567 else { |
| 568 char *primary = g_strdup_printf(_("Allow %s to contact you?"), name); | 568 char *primary = g_strdup_printf(_("Allow %s to contact you?"), name); |
| 569 char *secondary = | 569 char *secondary = |
| 570 g_strdup_printf(_("Are you sure you wish to allow " | 570 g_strdup_printf(_("Are you sure you wish to allow " |
| 571 "%s to contact you?"), name); | 571 "%s to contact you?"), name); |
| 572 | 572 |
| 573 | 573 |
| 574 purple_request_action_with_hint(account, _("Permit User"), primary, secondary, | 574 purple_request_action(account, _("Permit User"), primary, secondary, |
| 575 0, | 575 0, |
| 576 account, name, NULL, | 576 account, name, NULL, |
| 577 "privacy", data, 2, | 577 data, 2, |
| 578 _("_Permit"), G_CALLBACK(confirm_permit_block_cb), | 578 _("_Permit"), G_CALLBACK(confirm_permit_block_cb), |
| 579 _("Cancel"), G_CALLBACK(destroy_request_data)); | 579 _("Cancel"), G_CALLBACK(destroy_request_data)); |
| 580 | 580 |
| 581 g_free(primary); | 581 g_free(primary); |
| 582 g_free(secondary); | 582 g_free(secondary); |
| 594 data->account = account; | 594 data->account = account; |
| 595 data->name = g_strdup(name); | 595 data->name = g_strdup(name); |
| 596 data->block = TRUE; | 596 data->block = TRUE; |
| 597 | 597 |
| 598 if (name == NULL) { | 598 if (name == NULL) { |
| 599 purple_request_input_with_hint(account, _("Block User"), | 599 purple_request_input(account, _("Block User"), |
| 600 _("Type a user to block."), | 600 _("Type a user to block."), |
| 601 _("Please enter the name of the user you wish to block."), | 601 _("Please enter the name of the user you wish to block."), |
| 602 NULL, FALSE, FALSE, NULL, | 602 NULL, FALSE, FALSE, NULL, |
| 603 _("_Block"), G_CALLBACK(add_permit_block_cb), | 603 _("_Block"), G_CALLBACK(add_permit_block_cb), |
| 604 _("Cancel"), G_CALLBACK(destroy_request_data), | 604 _("Cancel"), G_CALLBACK(destroy_request_data), |
| 605 account, name, NULL, | 605 account, name, NULL, |
| 606 "privacy", data); | 606 data); |
| 607 } | 607 } |
| 608 else { | 608 else { |
| 609 char *primary = g_strdup_printf(_("Block %s?"), name); | 609 char *primary = g_strdup_printf(_("Block %s?"), name); |
| 610 char *secondary = | 610 char *secondary = |
| 611 g_strdup_printf(_("Are you sure you want to block %s?"), name); | 611 g_strdup_printf(_("Are you sure you want to block %s?"), name); |
| 612 | 612 |
| 613 purple_request_action_with_hint(account, _("Block User"), primary, secondary, | 613 purple_request_action(account, _("Block User"), primary, secondary, |
| 614 0, | 614 0, |
| 615 account, name, NULL, | 615 account, name, NULL, |
| 616 "privacy", data, 2, | 616 data, 2, |
| 617 _("_Block"), G_CALLBACK(confirm_permit_block_cb), | 617 _("_Block"), G_CALLBACK(confirm_permit_block_cb), |
| 618 _("Cancel"), G_CALLBACK(destroy_request_data)); | 618 _("Cancel"), G_CALLBACK(destroy_request_data)); |
| 619 | 619 |
| 620 g_free(primary); | 620 g_free(primary); |
| 621 g_free(secondary); | 621 g_free(secondary); |
