aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-individual-view.c
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:30:41 +0800
commit12b493671971c0a0a73b02bf467f448022ea88b7 (patch)
tree5282c82b802b2f99d4576d1cec7d617874de478c /libempathy-gtk/empathy-individual-view.c
parent251967fd833d753f2f4b30afb437d9cbc43dd89a (diff)
downloadgsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.tar
gsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.tar.gz
gsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.tar.bz2
gsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.tar.lz
gsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.tar.xz
gsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.tar.zst
gsoc2013-empathy-12b493671971c0a0a73b02bf467f448022ea88b7.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/empathy-individual-view.c')
-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 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, "");
}