From 6da159d09091d68a102c142b10747ae58755de51 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Wed, 9 Feb 2011 17:24:27 +1100 Subject: Add contact blocking support to EmpathyIndividualManager --- libempathy/empathy-individual-manager.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libempathy/empathy-individual-manager.h') diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index f2f5f5b56..daa7ec86a 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -36,6 +36,16 @@ G_BEGIN_DECLS #define EMPATHY_IS_INDIVIDUAL_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDIVIDUAL_MANAGER)) #define EMPATHY_INDIVIDUAL_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_MANAGER, EmpathyIndividualManagerClass)) +typedef enum +{ + EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS = 0, + EMPATHY_INDIVIDUAL_MANAGER_CAN_ADD = 1 << 0, + EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE = 1 << 1, + EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS = 1 << 2, + EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP = 1 << 3, + EMPATHY_INDIVIDUAL_MANAGER_CAN_BLOCK = 1 << 4, +} EmpathyIndividualManagerFlags; + typedef struct _EmpathyIndividualManager EmpathyIndividualManager; typedef struct _EmpathyIndividualManagerClass EmpathyIndividualManagerClass; @@ -81,5 +91,13 @@ void empathy_individual_manager_unlink_individual ( EmpathyIndividualManager *self, FolksIndividual *individual); +gboolean empathy_individual_manager_supports_blocking ( + EmpathyIndividualManager *self, + FolksIndividual *individual); + +void empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, + FolksIndividual *individual, + gboolean blocked); + G_END_DECLS #endif /* __EMPATHY_INDIVIDUAL_MANAGER_H__ */ -- cgit v1.2.3 From 95bbacd1eda4500ef9cef0f998ebb485861a3a3d Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Fri, 11 Feb 2011 16:17:48 +1100 Subject: Add confirmation dialog to Remove Also includes the future Report Abusive check box, so that all the strings are in place now. --- libempathy/empathy-individual-manager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libempathy/empathy-individual-manager.h') diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index daa7ec86a..12f8ccdb0 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -44,6 +44,7 @@ typedef enum EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS = 1 << 2, EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP = 1 << 3, EMPATHY_INDIVIDUAL_MANAGER_CAN_BLOCK = 1 << 4, + EMPATHY_INDIVIDUAL_MANAGER_CAN_REPORT_ABUSIVE = 1 << 5, } EmpathyIndividualManagerFlags; typedef struct _EmpathyIndividualManager EmpathyIndividualManager; -- cgit v1.2.3 From 81ba0edc73b6a226a054b76539645b7b4e5e2a99 Mon Sep 17 00:00:00 2001 From: Chandni Verma Date: Tue, 8 Mar 2011 13:36:05 +0530 Subject: Use Contact Manager flags instead of Individual Manager flags --- libempathy/empathy-individual-manager.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'libempathy/empathy-individual-manager.h') diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index 12f8ccdb0..75411b49c 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -36,17 +36,6 @@ G_BEGIN_DECLS #define EMPATHY_IS_INDIVIDUAL_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDIVIDUAL_MANAGER)) #define EMPATHY_INDIVIDUAL_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_MANAGER, EmpathyIndividualManagerClass)) -typedef enum -{ - EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS = 0, - EMPATHY_INDIVIDUAL_MANAGER_CAN_ADD = 1 << 0, - EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE = 1 << 1, - EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS = 1 << 2, - EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP = 1 << 3, - EMPATHY_INDIVIDUAL_MANAGER_CAN_BLOCK = 1 << 4, - EMPATHY_INDIVIDUAL_MANAGER_CAN_REPORT_ABUSIVE = 1 << 5, -} EmpathyIndividualManagerFlags; - typedef struct _EmpathyIndividualManager EmpathyIndividualManager; typedef struct _EmpathyIndividualManagerClass EmpathyIndividualManagerClass; -- cgit v1.2.3 From 103b4d5da19bf7ebf648658b8ff0ccab88aa24bd Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Mon, 14 Feb 2011 12:00:56 +1100 Subject: Hook up abusive argument into TpContactList backend --- libempathy/empathy-individual-manager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libempathy/empathy-individual-manager.h') 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__ */ -- cgit v1.2.3