diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-11 13:17:48 +0800 |
|---|---|---|
| committer | Chandni Verma <chandniverma2112@gmail.com> | 2011-03-08 12:04:57 +0800 |
| commit | 95bbacd1eda4500ef9cef0f998ebb485861a3a3d (patch) | |
| tree | 4c70d900678f5474ae99104bae7e45c1f8d72fd6 /libempathy-gtk/empathy-individual-view.c | |
| parent | 1e15d1b253163c98064997aabe6b127acbecc64b (diff) | |
| download | gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.tar gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.tar.gz gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.tar.bz2 gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.tar.lz gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.tar.xz gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.tar.zst gsoc2013-empathy-95bbacd1eda4500ef9cef0f998ebb485861a3a3d.zip | |
Add confirmation dialog to Remove
Also includes the future Report Abusive check box, so that all the strings
are in place now.
Diffstat (limited to 'libempathy-gtk/empathy-individual-view.c')
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 16 |
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); |