aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-individual-view.c
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk/empathy-individual-view.c')
-rw-r--r--libempathy-gtk/empathy-individual-view.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 4cb8a76f4..cea55a200 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -47,6 +47,7 @@
#include "empathy-individual-menu.h"
#include "empathy-individual-store.h"
#include "empathy-contact-dialogs.h"
+#include "empathy-individual-dialogs.h"
#include "empathy-images.h"
#include "empathy-linking-dialog.h"
#include "empathy-cell-renderer-expander.h"
@@ -2447,12 +2448,21 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem,
if (res == GTK_RESPONSE_YES || res == GTK_RESPONSE_REJECT)
{
- empathy_individual_manager_remove (manager, individual, "");
+ if (res == GTK_RESPONSE_REJECT &&
+ empathy_block_individual_dialog_show (parent, individual, NULL))
+ {
+ empathy_individual_manager_set_blocked (manager, individual,
+ TRUE);
+ }
+ else
+ {
+ goto finally;
+ }
- if (res == GTK_RESPONSE_REJECT)
- empathy_individual_manager_set_blocked (manager, individual, TRUE);
+ empathy_individual_manager_remove (manager, individual, "");
}
+finally:
g_free (text);
g_object_unref (individual);
g_object_unref (manager);