aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-14 22:24:43 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-16 18:24:37 +0800
commit18905073c9948920f1804540b332fb0758e2e5a3 (patch)
tree8a2f07ba36626ea882bd705b2014ebed36459475 /libempathy-gtk
parent8f7700d66b8ff5056777c803e754b8c00430ab2a (diff)
downloadgsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.tar
gsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.tar.gz
gsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.tar.bz2
gsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.tar.lz
gsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.tar.xz
gsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.tar.zst
gsoc2013-empathy-18905073c9948920f1804540b332fb0758e2e5a3.zip
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().
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-individual-view.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 89f39f1a7..f72f6e644 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -2474,17 +2474,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, "");
}