diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-24 22:42:51 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-24 22:42:51 +0800 |
| commit | 5d0242ce18d39faed5fc2924cb58e8963150504c (patch) | |
| tree | e91cd60963ac6f2019b53712d681ba78b6458d78 | |
| parent | e7833bc3849245d26de70b13e94405fc682ed9ca (diff) | |
| download | gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.tar gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.tar.gz gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.tar.bz2 gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.tar.lz gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.tar.xz gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.tar.zst gsoc2013-empathy-5d0242ce18d39faed5fc2924cb58e8963150504c.zip | |
tp-roomlist: port to new tp-glib account API
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
| -rw-r--r-- | libempathy/empathy-tp-roomlist.c | 10 | ||||
| -rw-r--r-- | libempathy/empathy-tp-roomlist.h | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c index 54d232339..2e95f3957 100644 --- a/libempathy/empathy-tp-roomlist.c +++ b/libempathy/empathy-tp-roomlist.c @@ -28,8 +28,6 @@ #include <telepathy-glib/util.h> #include <telepathy-glib/interfaces.h> -#include "empathy-account.h" - #include "empathy-tp-roomlist.h" #include "empathy-chatroom.h" #include "empathy-utils.h" @@ -41,7 +39,7 @@ typedef struct { TpConnection *connection; TpChannel *channel; - EmpathyAccount *account; + TpAccount *account; gboolean is_listing; gboolean start_requested; } EmpathyTpRoomlistPriv; @@ -354,7 +352,7 @@ tp_roomlist_constructed (GObject *list) { EmpathyTpRoomlistPriv *priv = GET_PRIV (list); - priv->connection = empathy_account_get_connection (priv->account); + priv->connection = tp_account_get_connection (priv->account); g_object_ref (priv->connection); tp_cli_connection_call_request_channel (priv->connection, -1, @@ -421,7 +419,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass) g_param_spec_object ("account", "The Account", "The account on which it lists rooms", - EMPATHY_TYPE_ACCOUNT, + TP_TYPE_ACCOUNT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, @@ -477,7 +475,7 @@ empathy_tp_roomlist_init (EmpathyTpRoomlist *list) } EmpathyTpRoomlist * -empathy_tp_roomlist_new (EmpathyAccount *account) +empathy_tp_roomlist_new (TpAccount *account) { EmpathyTpRoomlist *list; diff --git a/libempathy/empathy-tp-roomlist.h b/libempathy/empathy-tp-roomlist.h index 801e5c69f..f400766a9 100644 --- a/libempathy/empathy-tp-roomlist.h +++ b/libempathy/empathy-tp-roomlist.h @@ -24,8 +24,8 @@ #include <glib.h> +#include <telepathy-glib/account.h> #include <telepathy-glib/connection.h> -#include <libempathy/empathy-account.h> G_BEGIN_DECLS @@ -49,7 +49,7 @@ struct _EmpathyTpRoomlistClass { }; GType empathy_tp_roomlist_get_type (void) G_GNUC_CONST; -EmpathyTpRoomlist *empathy_tp_roomlist_new (EmpathyAccount *account); +EmpathyTpRoomlist *empathy_tp_roomlist_new (TpAccount *account); gboolean empathy_tp_roomlist_is_listing (EmpathyTpRoomlist *list); void empathy_tp_roomlist_start (EmpathyTpRoomlist *list); void empathy_tp_roomlist_stop (EmpathyTpRoomlist *list); |