chatroom: port to new tp-glib account API

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 33df9a3d688723c8d1f14f37566de1c6f0f00d61..5d43a3ec11c595ddd367e964cd92ba7f80d106ca 100644 (file)
--- 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;
 

diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index c18c27449f3b4ecdaef34d900c0d68ffd04a36db..3048aded7e089d08982daf6cb2a1b80ba2ad4f75 100644 (file)
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -24,7 +24,8 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-account.h>
+#include <telepathy-glib/account.h>
+
 #include <libempathy/empathy-tp-chat.h>
 
 G_BEGIN_DECLS
@@ -51,14 +52,14 @@ struct _EmpathyChatroomClass {
 };
 
 GType            empathy_chatroom_get_type        (void) G_GNUC_CONST;
-EmpathyChatroom *empathy_chatroom_new             (EmpathyAccount  *account);
-EmpathyChatroom *empathy_chatroom_new_full        (EmpathyAccount  *account,
+EmpathyChatroom *empathy_chatroom_new             (TpAccount       *account);
+EmpathyChatroom *empathy_chatroom_new_full        (TpAccount       *account,
                                                   const gchar     *room,
                                                   const gchar     *name,
                                                   gboolean         auto_connect);
-EmpathyAccount *     empathy_chatroom_get_account      (EmpathyChatroom *chatroom);
+TpAccount *     empathy_chatroom_get_account      (EmpathyChatroom *chatroom);
 void            empathy_chatroom_set_account      (EmpathyChatroom *chatroom,
-                                                  EmpathyAccount  *account);
+                                                  TpAccount       *account);
 const gchar *   empathy_chatroom_get_room         (EmpathyChatroom *chatroom);
 void            empathy_chatroom_set_room         (EmpathyChatroom *chatroom,
                                                   const gchar     *room);