aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2009-04-24 14:36:23 +0800
committerDavyd Madeley <davyd@madeley.id.au>2009-07-15 18:12:15 +0800
commit98d43b78d70e1a2ff6a0b931ad1b8e11790daff0 (patch)
tree204689f35d09bba1a88eddd9020c9a6fc424e91d
parent0c0c427ea240b0615cc08658fc318516d4259d3e (diff)
downloadgsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.tar
gsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.tar.gz
gsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.tar.bz2
gsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.tar.lz
gsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.tar.xz
gsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.tar.zst
gsoc2013-empathy-98d43b78d70e1a2ff6a0b931ad1b8e11790daff0.zip
Convert empathy_contact_manager_can_add() to empathy_contact_manager_get_flags_for_connection()
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.c2
-rw-r--r--libempathy/empathy-contact-manager.c9
-rw-r--r--libempathy/empathy-contact-manager.h3
3 files changed, 8 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index d271cdd28..0155f610e 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -340,7 +340,7 @@ can_add_contact_to_account (EmpathyAccount *account,
return FALSE;
contact_manager = empathy_contact_manager_dup_singleton ();
- result = empathy_contact_manager_can_add (contact_manager, connection);
+ result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
g_object_unref (contact_manager);
return result;
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 49155c8c5..5ce463c4c 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -527,9 +527,10 @@ contact_manager_iface_init (EmpathyContactListIface *iface)
iface->remove_group = contact_manager_remove_group;
}
-gboolean
-empathy_contact_manager_can_add (EmpathyContactManager *manager,
- TpConnection *connection)
+EmpathyContactListFlags
+empathy_contact_manager_get_flags_for_connection (
+ EmpathyContactManager *manager,
+ TpConnection *connection)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
EmpathyContactList *list;
@@ -544,6 +545,6 @@ empathy_contact_manager_can_add (EmpathyContactManager *manager,
}
flags = empathy_contact_list_get_flags (list);
- return (flags & EMPATHY_CONTACT_LIST_CAN_ADD);
+ return flags;
}
diff --git a/libempathy/empathy-contact-manager.h b/libempathy/empathy-contact-manager.h
index fbe9e2df0..d68b4ea26 100644
--- a/libempathy/empathy-contact-manager.h
+++ b/libempathy/empathy-contact-manager.h
@@ -53,7 +53,8 @@ GType empathy_contact_manager_get_type (void) G_GNUC_CONST;
EmpathyContactManager *empathy_contact_manager_dup_singleton (void);
EmpathyTpContactList * empathy_contact_manager_get_list (EmpathyContactManager *manager,
TpConnection *connection);
-gboolean empathy_contact_manager_can_add (EmpathyContactManager *manager,
+EmpathyContactListFlags empathy_contact_manager_get_flags_for_connection (
+ EmpathyContactManager *manager,
TpConnection *connection);
G_END_DECLS