diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:21:29 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:21:29 +0800 |
| commit | 0a41b6b31705626c71047261b91afdac711dead7 (patch) | |
| tree | e51c864f00c5966a5bcb903d2b4c35324bf968b7 /libempathy/empathy-chatroom.h | |
| parent | a980a2b3eaa634981b0ebfe950f50b515e43cf4a (diff) | |
| parent | 1a74f07d19bdbdbf0aa62587343b64f636ec7b20 (diff) | |
| download | gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.gz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.bz2 gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.lz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.xz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.zst gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.zip | |
Merge branch 'empathy-account'
Diffstat (limited to 'libempathy/empathy-chatroom.h')
| -rw-r--r-- | libempathy/empathy-chatroom.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 560517d48..c18c27449 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -24,8 +24,7 @@ #include <glib-object.h> -#include <libmissioncontrol/mc-account.h> - +#include <libempathy/empathy-account.h> #include <libempathy/empathy-tp-chat.h> G_BEGIN_DECLS @@ -52,14 +51,14 @@ struct _EmpathyChatroomClass { }; GType empathy_chatroom_get_type (void) G_GNUC_CONST; -EmpathyChatroom *empathy_chatroom_new (McAccount *account); -EmpathyChatroom *empathy_chatroom_new_full (McAccount *account, +EmpathyChatroom *empathy_chatroom_new (EmpathyAccount *account); +EmpathyChatroom *empathy_chatroom_new_full (EmpathyAccount *account, const gchar *room, const gchar *name, gboolean auto_connect); -McAccount * empathy_chatroom_get_account (EmpathyChatroom *chatroom); +EmpathyAccount * empathy_chatroom_get_account (EmpathyChatroom *chatroom); void empathy_chatroom_set_account (EmpathyChatroom *chatroom, - McAccount *account); + EmpathyAccount *account); const gchar * empathy_chatroom_get_room (EmpathyChatroom *chatroom); void empathy_chatroom_set_room (EmpathyChatroom *chatroom, const gchar *room); |