diff options
| -rw-r--r-- | libempathy-gtk/empathy-contact-blocking-dialog.ui | 10 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.ui b/libempathy-gtk/empathy-contact-blocking-dialog.ui index b2ea89b81..dd17126d7 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.ui +++ b/libempathy-gtk/empathy-contact-blocking-dialog.ui @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <interface> <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy project-wide --> @@ -13,6 +13,7 @@ <object class="GtkVBox" id="contents"> <property name="visible">True</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="account-hbox"> @@ -82,12 +83,11 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="remove-button"> - <property name="label">gtk-remove</property> + <property name="label">Unblock</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> @@ -114,7 +114,7 @@ <object class="GtkEntry" id="add-contact-entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> </object> <packing> <property name="position">0</property> @@ -142,8 +142,8 @@ </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> - <widget name="add-button"/> <widget name="remove-button"/> + <widget name="add-button"/> </widgets> </object> </interface> diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 90a9fc6db..12486195c 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -2229,8 +2229,8 @@ empathy_individual_view_get_selected_group (EmpathyIndividualView *view, enum { REMOVE_DIALOG_RESPONSE_CANCEL = 0, - REMOVE_DIALOG_RESPONSE_DELETE, - REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK, + REMOVE_DIALOG_RESPONSE_REMOVE, + REMOVE_DIALOG_RESPONSE_REMOVE_AND_BLOCK, }; static int @@ -2260,17 +2260,17 @@ individual_view_remove_dialog_show (GtkWindow *parent, /* gtk_dialog_add_button() doesn't allow us to pass a string with a * mnemonic so we have to create the button manually. */ button = gtk_button_new_with_mnemonic ( - _("Delete and _Block")); + _("Remove and _Block")); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, - REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK); + REMOVE_DIALOG_RESPONSE_REMOVE_AND_BLOCK); gtk_widget_show (button); } gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, REMOVE_DIALOG_RESPONSE_CANCEL, - GTK_STOCK_DELETE, REMOVE_DIALOG_RESPONSE_DELETE, NULL); + GTK_STOCK_REMOVE, REMOVE_DIALOG_RESPONSE_REMOVE, NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text); @@ -2300,7 +2300,7 @@ individual_view_group_remove_activate_cb (GtkMenuItem *menuitem, group); parent = empathy_get_toplevel_window (GTK_WIDGET (view)); if (individual_view_remove_dialog_show (parent, _("Removing group"), - text, FALSE, NULL) == REMOVE_DIALOG_RESPONSE_DELETE) + text, FALSE, NULL) == REMOVE_DIALOG_RESPONSE_REMOVE) { EmpathyIndividualManager *manager = empathy_individual_manager_dup_singleton (); @@ -2409,12 +2409,12 @@ got_avatar (GObject *source_object, res = individual_view_remove_dialog_show (parent, _("Removing contact"), text, can_block, avatar); - if (res == REMOVE_DIALOG_RESPONSE_DELETE || - res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK) + if (res == REMOVE_DIALOG_RESPONSE_REMOVE || + res == REMOVE_DIALOG_RESPONSE_REMOVE_AND_BLOCK) { gboolean abusive; - if (res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK) + if (res == REMOVE_DIALOG_RESPONSE_REMOVE_AND_BLOCK) { if (!empathy_block_individual_dialog_show (parent, individual, avatar, &abusive)) |