Completely remove TpConn and TpChan

svn path=/trunk/; revision=895

diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index df9ad2e70c1c8aebadcb56efbc363384cfe11b29..b2fc30903154e8b55442c627d6fdf5cd62a5b6ae 100644 (file)
--- 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 93ffd5281f588aabb64903f6c2f7b1e2693870a5..f52c611c3092bdd7de235313ed0b2c4ec5ce4406 100644 (file)
--- 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);