diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-04-24 23:28:22 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-04-24 23:28:22 +0800 |
| commit | f02d96379cb7043611d093921755d699e48689bb (patch) | |
| tree | 4a7cb101ebe4295306f17f12f805e4672c30bff6 /libempathy/empathy-contact-manager.h | |
| parent | c8d23985b7754541cab512992294c19f5c87cfaa (diff) | |
| parent | d696d6cc31f672884382d5b8949be504cdc718a5 (diff) | |
| download | gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.tar gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.tar.gz gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.tar.bz2 gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.tar.lz gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.tar.xz gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.tar.zst gsoc2013-empathy-f02d96379cb7043611d093921755d699e48689bb.zip | |
Merge branch 'master' into tp-tube
Diffstat (limited to 'libempathy/empathy-contact-manager.h')
| -rw-r--r-- | libempathy/empathy-contact-manager.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libempathy/empathy-contact-manager.h b/libempathy/empathy-contact-manager.h index 57e8764e4..fbe9e2df0 100644 --- a/libempathy/empathy-contact-manager.h +++ b/libempathy/empathy-contact-manager.h @@ -24,8 +24,6 @@ #include <glib.h> -#include <libmissioncontrol/mc-account.h> - #include "empathy-contact.h" #include "empathy-tp-contact-list.h" #include "empathy-contact-list.h" @@ -54,9 +52,9 @@ struct _EmpathyContactManagerClass { 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, - McAccount *account); + TpConnection *connection); gboolean empathy_contact_manager_can_add (EmpathyContactManager *manager, - McAccount *account); + TpConnection *connection); G_END_DECLS |