diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-24 22:30:09 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-24 22:30:09 +0800 |
| commit | effa229f70dd19601ea90edb3185cd984546658e (patch) | |
| tree | 2ad5744a44105b32c653d7a46f2fc64ae2add699 /libempathy/empathy-chatroom.c | |
| parent | 9a4f28b016985fa303959032182bdbdf2c69c481 (diff) | |
| download | gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.tar gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.tar.gz gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.tar.bz2 gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.tar.lz gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.tar.xz gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.tar.zst gsoc2013-empathy-effa229f70dd19601ea90edb3185cd984546658e.zip | |
chatroom: port to new tp-glib account API
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'libempathy/empathy-chatroom.c')
| -rw-r--r-- | libempathy/empathy-chatroom.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index 33df9a3d6..5d43a3ec1 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -31,7 +31,7 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom) typedef struct { - EmpathyAccount *account; + TpAccount *account; gchar *room; gchar *name; gboolean auto_connect; @@ -84,7 +84,7 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass) g_param_spec_object ("account", "Chatroom Account", "The account associated with an chatroom", - EMPATHY_TYPE_ACCOUNT, + TP_TYPE_ACCOUNT, G_PARAM_READWRITE)); g_object_class_install_property (object_class, @@ -312,7 +312,7 @@ chatroom_set_property (GObject *object, } EmpathyChatroom * -empathy_chatroom_new (EmpathyAccount *account) +empathy_chatroom_new (TpAccount *account) { return g_object_new (EMPATHY_TYPE_CHATROOM, "account", account, @@ -320,7 +320,7 @@ empathy_chatroom_new (EmpathyAccount *account) } EmpathyChatroom * -empathy_chatroom_new_full (EmpathyAccount *account, +empathy_chatroom_new_full (TpAccount *account, const gchar *room, const gchar *name, gboolean auto_connect) @@ -335,7 +335,7 @@ empathy_chatroom_new_full (EmpathyAccount *account, NULL); } -EmpathyAccount * +TpAccount * empathy_chatroom_get_account (EmpathyChatroom *chatroom) { EmpathyChatroomPriv *priv; @@ -348,7 +348,7 @@ empathy_chatroom_get_account (EmpathyChatroom *chatroom) void empathy_chatroom_set_account (EmpathyChatroom *chatroom, - EmpathyAccount *account) + TpAccount *account) { EmpathyChatroomPriv *priv; @@ -466,8 +466,8 @@ gboolean empathy_chatroom_equal (gconstpointer v1, gconstpointer v2) { - EmpathyAccount *account_a; - EmpathyAccount *account_b; + TpAccount *account_a; + TpAccount *account_b; const gchar *room_a; const gchar *room_b; |