empathy r895 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr 11 14:10:39 2008
New Revision: 895
URL: http://svn.gnome.org/viewvc/empathy?rev=895&view=rev

Log:
Completely remove TpConn and TpChan


Modified:
   trunk/libempathy/empathy-tp-group.c
   trunk/libempathy/empathy-tp-group.h

Modified: trunk/libempathy/empathy-tp-group.c
==============================================================================
--- trunk/libempathy/empathy-tp-group.c	(original)
+++ trunk/libempathy/empathy-tp-group.c	Fri Apr 11 14:10:39 2008
@@ -966,18 +966,6 @@
 	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)
 {

Modified: trunk/libempathy/empathy-tp-group.h
==============================================================================
--- trunk/libempathy/empathy-tp-group.h	(original)
+++ trunk/libempathy/empathy-tp-group.h	Fri Apr 11 14:10:39 2008
@@ -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 @@
 
 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_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);