From 12b493671971c0a0a73b02bf467f448022ea88b7 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 14 Mar 2011 15:24:43 +0100 Subject: individual-view: call empathy_individual_manager_remove() also when the response is GTK_RESPONSE_YES Also, don't remove the contact if the operation has been cancelled in empathy_block_individual_dialog_show(). --- libempathy-gtk/empathy-individual-view.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index cb96d2e8a..b121801bd 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -2394,17 +2394,15 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem, { gboolean abusive; - if (res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK && - empathy_block_individual_dialog_show (parent, individual, - &abusive)) + if (res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK) { + if (!empathy_block_individual_dialog_show (parent, individual, + &abusive)) + goto finally; + empathy_individual_manager_set_blocked (manager, individual, TRUE, abusive); } - else - { - goto finally; - } empathy_individual_manager_remove (manager, individual, ""); } -- cgit v1.2.3