From 5675878b4de1a89136a5a8c5cbe63231cf10f0f3 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 11 Apr 2008 13:10:39 +0000 Subject: Completely remove TpConn and TpChan svn path=/trunk/; revision=895 --- libempathy/empathy-tp-group.c | 12 ------------ libempathy/empathy-tp-group.h | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'libempathy') 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 -#include #include #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); -- cgit v1.2.3