diff options
author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-11 21:10:39 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-11 21:10:39 +0800 |
commit | 5675878b4de1a89136a5a8c5cbe63231cf10f0f3 (patch) | |
tree | a7fb1897e5a1eb36873882ef4743ed841ff580ce | |
parent | 9335e9e00a694a5614298fbf5fc8424640516e93 (diff) | |
download | gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.tar gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.tar.gz gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.tar.bz2 gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.tar.lz gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.tar.xz gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.tar.zst gsoc2013-empathy-5675878b4de1a89136a5a8c5cbe63231cf10f0f3.zip |
Completely remove TpConn and TpChan
svn path=/trunk/; revision=895
-rw-r--r-- | libempathy/empathy-tp-group.c | 12 | ||||
-rw-r--r-- | libempathy/empathy-tp-group.h | 6 |
2 files changed, 2 insertions, 16 deletions
diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c index df9ad2e70..b2fc30903 100644 --- a/libempathy/empathy-tp-group.c +++ b/libempathy/empathy-tp-group.c @@ -966,18 +966,6 @@ empathy_tp_group_get_self_contact (EmpathyTpGroup *group) return tp_group_get_contact (group, priv->self_handle); } -const gchar * -empathy_tp_group_get_object_path (EmpathyTpGroup *group) -{ - EmpathyTpGroupPriv *priv; - - g_return_val_if_fail (EMPATHY_IS_TP_GROUP (group), NULL); - - priv = GET_PRIV (group); - - return TP_PROXY (priv->channel)->object_path; -} - TpChan * empathy_tp_group_get_channel (EmpathyTpGroup *group) { diff --git a/libempathy/empathy-tp-group.h b/libempathy/empathy-tp-group.h index 93ffd5281..f52c611c3 100644 --- a/libempathy/empathy-tp-group.h +++ b/libempathy/empathy-tp-group.h @@ -25,7 +25,6 @@ #include <glib.h> -#include <libtelepathy/tp-chan.h> #include <libmissioncontrol/mc-account.h> #include "empathy-contact.h" @@ -60,7 +59,7 @@ typedef struct { GType empathy_tp_group_get_type (void) G_GNUC_CONST; EmpathyTpGroup * empathy_tp_group_new (McAccount *account, - TpChan *tp_chan); + TpChannel *channel); void empathy_tp_group_close (EmpathyTpGroup *group); void empathy_tp_group_add_members (EmpathyTpGroup *group, GList *contacts, @@ -79,8 +78,7 @@ GList * empathy_tp_group_get_local_pendings (EmpathyTpGroup *gr GList * empathy_tp_group_get_remote_pendings (EmpathyTpGroup *group); const gchar * empathy_tp_group_get_name (EmpathyTpGroup *group); EmpathyContact * empathy_tp_group_get_self_contact (EmpathyTpGroup *group); -const gchar * empathy_tp_group_get_object_path (EmpathyTpGroup *group); -TpChan * empathy_tp_group_get_channel (EmpathyTpGroup *group); +TpChannel * empathy_tp_group_get_channel (EmpathyTpGroup *group); gboolean empathy_tp_group_is_member (EmpathyTpGroup *group, EmpathyContact *contact); gboolean empathy_tp_group_is_ready (EmpathyTpGroup *group); |