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().

1 files changed, 5 insertions, 7 deletions

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, "");
         }