diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-02-14 09:00:56 +0800 |
|---|---|---|
| committer | Chandni Verma <chandniverma2112@gmail.com> | 2011-03-11 13:10:17 +0800 |
| commit | 103b4d5da19bf7ebf648658b8ff0ccab88aa24bd (patch) | |
| tree | 28dd101a3ea24b525fa3e4d492803a6d80986940 /libempathy | |
| parent | 0a9fd8a0a7517f099ca1b908679ab7935513cd9a (diff) | |
| download | gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.tar gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.tar.gz gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.tar.bz2 gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.tar.lz gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.tar.xz gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.tar.zst gsoc2013-empathy-103b4d5da19bf7ebf648658b8ff0ccab88aa24bd.zip | |
Hook up abusive argument into TpContactList backend
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact-list.c | 5 | ||||
| -rw-r--r-- | libempathy/empathy-contact-list.h | 6 | ||||
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-individual-manager.c | 5 | ||||
| -rw-r--r-- | libempathy/empathy-individual-manager.h | 3 | ||||
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 3 |
6 files changed, 18 insertions, 10 deletions
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index d8af8938f..d28866735 100644 --- a/libempathy/empathy-contact-list.c +++ b/libempathy/empathy-contact-list.c @@ -282,12 +282,13 @@ empathy_contact_list_remove_from_favourites (EmpathyContactList *list, void empathy_contact_list_set_blocked (EmpathyContactList *list, EmpathyContact *contact, - gboolean blocked) + gboolean blocked, + gboolean abusive) { EmpathyContactListIface *iface = EMPATHY_CONTACT_LIST_GET_IFACE (list); if (iface->set_blocked != NULL) - iface->set_blocked (list, contact, blocked); + iface->set_blocked (list, contact, blocked, abusive); } gboolean diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h index 8be93baf9..cf523bf2a 100644 --- a/libempathy/empathy-contact-list.h +++ b/libempathy/empathy-contact-list.h @@ -81,7 +81,8 @@ struct _EmpathyContactListIface { EmpathyContact *contact); void (*set_blocked) (EmpathyContactList *list, EmpathyContact *contact, - gboolean blocked); + gboolean blocked, + gboolean abusive); gboolean (*get_blocked) (EmpathyContactList *list, EmpathyContact *contact); }; @@ -125,7 +126,8 @@ void empathy_contact_list_remove_from_favourites void empathy_contact_list_set_blocked (EmpathyContactList *list, EmpathyContact *contact, - gboolean blocked); + gboolean blocked, + gboolean abusive); gboolean empathy_contact_list_get_blocked (EmpathyContactList *list, EmpathyContact *contact); diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 2242159b5..b00f82477 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -867,7 +867,8 @@ contact_manager_remove_group (EmpathyContactList *manager, static void contact_manager_set_blocked (EmpathyContactList *manager, EmpathyContact *contact, - gboolean blocked) + gboolean blocked, + gboolean abusive) { EmpathyContactManagerPriv *priv = GET_PRIV (manager); EmpathyContactList *list; @@ -879,7 +880,8 @@ contact_manager_set_blocked (EmpathyContactList *manager, list = g_hash_table_lookup (priv->lists, connection); if (list != NULL) { - empathy_contact_list_set_blocked (list, contact, blocked); + empathy_contact_list_set_blocked (list, contact, + blocked, abusive); } } diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 71d15bb34..d56570c92 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -532,7 +532,8 @@ empathy_individual_manager_supports_blocking (EmpathyIndividualManager *self, void empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, FolksIndividual *individual, - gboolean blocked) + gboolean blocked, + gboolean abusive) { EmpathyIndividualManagerPriv *priv; GList *personas, *l; @@ -558,7 +559,7 @@ empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, manager = empathy_contact_manager_dup_singleton (); empathy_contact_list_set_blocked ( EMPATHY_CONTACT_LIST (manager), - contact, blocked); + contact, blocked, abusive); g_object_unref (manager); g_object_unref (contact); diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index 75411b49c..1fec67d91 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -87,7 +87,8 @@ gboolean empathy_individual_manager_supports_blocking ( void empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, FolksIndividual *individual, - gboolean blocked); + gboolean blocked, + gboolean abusive); G_END_DECLS #endif /* __EMPATHY_INDIVIDUAL_MANAGER_H__ */ diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index ec4f17245..9b3383d9f 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -1313,7 +1313,8 @@ tp_contact_list_get_flags (EmpathyContactList *list) static void tp_contact_list_set_blocked (EmpathyContactList *list, EmpathyContact *contact, - gboolean blocked) + gboolean blocked, + gboolean abusive) { EmpathyTpContactListPriv *priv = GET_PRIV (list); TpHandle handle = empathy_contact_get_handle (contact); |