diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-14 09:00:56 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-14 09:07:37 +0800 |
| commit | 89546bb514ec002bfddf7a13998398efa89a5cb5 (patch) | |
| tree | e87843d411d082340ae6d3b85ad767b8fec1beb5 /libempathy-gtk | |
| parent | 20700ef6d7f72e7211195016335cac43ea2195e2 (diff) | |
| download | gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.tar gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.tar.gz gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.tar.bz2 gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.tar.lz gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.tar.xz gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.tar.zst gsoc2013-empathy-89546bb514ec002bfddf7a13998398efa89a5cb5.zip | |
Hook up abusive argument into TpContactList backend
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 0b388851e..b9bf7e050 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -85,15 +85,17 @@ subscription_dialog_response_cb (GtkDialog *dialog, contact, ""); } else if (response == GTK_RESPONSE_REJECT) { + gboolean abusive; + /* confirm the blocking */ if (empathy_block_contact_dialog_show (GTK_WINDOW (dialog), - contact, NULL)) { + contact, &abusive)) { empathy_contact_list_remove ( EMPATHY_CONTACT_LIST (manager), contact, ""); empathy_contact_list_set_blocked ( EMPATHY_CONTACT_LIST (manager), - contact, TRUE); + contact, TRUE, abusive); } else { /* if they don't confirm, return back to the * first dialog */ diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 9984de42d..64056eebf 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -232,7 +232,7 @@ empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item, { static guint block_signal = 0; EmpathyContactManager *manager; - gboolean blocked; + gboolean blocked, abusive; if (block_signal > 0) return; @@ -250,13 +250,13 @@ empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item, "window"); if (!empathy_block_contact_dialog_show (GTK_WINDOW (parent), - contact, NULL)) + contact, &abusive)) return; } manager = empathy_contact_manager_dup_singleton (); empathy_contact_list_set_blocked (EMPATHY_CONTACT_LIST (manager), - contact, blocked); + contact, blocked, abusive); g_object_unref (manager); /* update the toggle with the blocked status */ diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 55d25f801..d952b8269 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -2352,11 +2352,14 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem, text, can_block); if (res == GTK_RESPONSE_YES || res == GTK_RESPONSE_REJECT) { + gboolean abusive; + if (res == GTK_RESPONSE_REJECT && - empathy_block_individual_dialog_show (parent, individual, NULL)) + empathy_block_individual_dialog_show (parent, individual, + &abusive)) { empathy_individual_manager_set_blocked (manager, individual, - TRUE); + TRUE, abusive); } else { |