diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-11 13:17:48 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-11 13:17:48 +0800 |
| commit | 068551e68046f42a8278c01186e10fb1142493f9 (patch) | |
| tree | 58ea49eb835fed0fae9e8ad545210d80d241ff78 /libempathy-gtk/empathy-individual-view.c | |
| parent | ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724 (diff) | |
| download | gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.tar gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.tar.gz gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.tar.bz2 gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.tar.lz gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.tar.xz gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.tar.zst gsoc2013-empathy-068551e68046f42a8278c01186e10fb1142493f9.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 8da849503..f719dfa74 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -48,6 +48,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" @@ -2352,12 +2353,21 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem, text, can_block); 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); |