diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-11 12:27:05 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-11 12:27:05 +0800 |
| commit | ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724 (patch) | |
| tree | 40a5dead0ce9669a83e5307f1d4c8b45ae166155 /libempathy-gtk | |
| parent | 56100a85fb2986ed04436a5988791f235215d402 (diff) | |
| download | gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.tar gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.tar.gz gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.tar.bz2 gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.tar.lz gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.tar.xz gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.tar.zst gsoc2013-empathy-ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724.zip | |
Add block confirmation to the authorise publication dialog
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index d6257fc33..0b388851e 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -80,19 +80,31 @@ subscription_dialog_response_cb (GtkDialog *dialog, empathy_contact_set_alias (contact, empathy_contact_widget_get_alias (contact_widget)); } - else if (response == GTK_RESPONSE_NO || - response == GTK_RESPONSE_REJECT) { + else if (response == GTK_RESPONSE_NO) { empathy_contact_list_remove (EMPATHY_CONTACT_LIST (manager), contact, ""); - - if (response == GTK_RESPONSE_REJECT) { + } + else if (response == GTK_RESPONSE_REJECT) { + /* confirm the blocking */ + if (empathy_block_contact_dialog_show (GTK_WINDOW (dialog), + contact, NULL)) { + empathy_contact_list_remove ( + EMPATHY_CONTACT_LIST (manager), + contact, ""); empathy_contact_list_set_blocked ( - EMPATHY_CONTACT_LIST (manager), contact, TRUE); + EMPATHY_CONTACT_LIST (manager), + contact, TRUE); + } else { + /* if they don't confirm, return back to the + * first dialog */ + goto finally; } } subscription_dialogs = g_list_remove (subscription_dialogs, dialog); gtk_widget_destroy (GTK_WIDGET (dialog)); + +finally: g_object_unref (manager); } |