From f5f2d3a1cf71a4fc89c517a15d1413bfd1bfcac5 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Tue, 12 Oct 2010 23:20:55 -0700 Subject: Cut obsolete IndividualManagerFlags. Helps bgo#625969. --- libempathy/empathy-individual-manager.c | 30 ------------------------------ libempathy/empathy-individual-manager.h | 13 ------------- 2 files changed, 43 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index d707e17bf..9a1891d06 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -502,36 +502,6 @@ empathy_individual_manager_remove_group (EmpathyIndividualManager *manager, (gpointer) group); } -EmpathyIndividualManagerFlags -empathy_individual_manager_get_flags_for_connection ( - EmpathyIndividualManager *self, - TpConnection *connection) -{ - EmpathyIndividualManagerPriv *priv; - EmpathyContactListFlags list_flags; - EmpathyIndividualManagerFlags flags; - - g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self), - EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS); - - priv = GET_PRIV (self); - - list_flags = empathy_contact_manager_get_flags_for_connection ( - priv->contact_manager, connection); - - flags = EMPATHY_INDIVIDUAL_MANAGER_NO_FLAGS; - if (list_flags & EMPATHY_CONTACT_LIST_CAN_ADD) - flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_ADD; - if (list_flags & EMPATHY_CONTACT_LIST_CAN_REMOVE) - flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_REMOVE; - if (list_flags & EMPATHY_CONTACT_LIST_CAN_ALIAS) - flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_ALIAS; - if (list_flags & EMPATHY_CONTACT_LIST_CAN_GROUP) - flags |= EMPATHY_INDIVIDUAL_MANAGER_CAN_GROUP; - - return flags; -} - static void link_personas_cb (FolksIndividualAggregator *aggregator, GAsyncResult *async_result, diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index 72104fc40..f2f5f5b56 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -35,14 +35,6 @@ G_BEGIN_DECLS #define EMPATHY_IS_INDIVIDUAL_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDIVIDUAL_MANAGER)) #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, -} EmpathyIndividualManagerFlags; typedef struct _EmpathyIndividualManager EmpathyIndividualManager; typedef struct _EmpathyIndividualManagerClass EmpathyIndividualManagerClass; @@ -82,11 +74,6 @@ void empathy_individual_manager_remove (EmpathyIndividualManager *manager, void empathy_individual_manager_remove_group (EmpathyIndividualManager *manager, const gchar *group); -EmpathyIndividualManagerFlags -empathy_individual_manager_get_flags_for_connection ( - EmpathyIndividualManager *manager, - TpConnection *connection); - void empathy_individual_manager_link_personas (EmpathyIndividualManager *self, GList *personas); -- cgit v1.2.3