empathy r769 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Mar 11 12:23:02 2008
New Revision: 769
URL: http://svn.gnome.org/viewvc/empathy?rev=769&view=rev

Log:
Add back "tp-chan" property, still used to inspect the channel handle.


Modified:
   trunk/libempathy/empathy-tp-chat.c
   trunk/libempathy/empathy-tp-chatroom.c

Modified: trunk/libempathy/empathy-tp-chat.c
==============================================================================
--- trunk/libempathy/empathy-tp-chat.c	(original)
+++ trunk/libempathy/empathy-tp-chat.c	Tue Mar 11 12:23:02 2008
@@ -64,6 +64,7 @@
 enum {
 	PROP_0,
 	PROP_ACCOUNT,
+	PROP_TP_CHAN,
 	PROP_CHANNEL,
 	PROP_ACKNOWLEDGE,
 };
@@ -608,6 +609,9 @@
 	case PROP_ACCOUNT:
 		g_value_set_object (value, priv->account);
 		break;
+	case PROP_TP_CHAN:
+		g_value_set_object (value, priv->tp_chan);
+		break;
 	case PROP_CHANNEL:
 		g_value_set_object (value, priv->channel);
 		break;
@@ -632,6 +636,9 @@
 	case PROP_ACCOUNT:
 		priv->account = g_object_ref (g_value_get_object (value));
 		break;
+	case PROP_TP_CHAN:
+		priv->tp_chan = g_object_ref (g_value_get_object (value));
+		break;
 	case PROP_CHANNEL:
 		priv->channel = g_object_ref (g_value_get_object (value));
 		break;
@@ -665,6 +672,15 @@
 							      G_PARAM_READWRITE |
 							      G_PARAM_CONSTRUCT_ONLY));
 	g_object_class_install_property (object_class,
+					 PROP_TP_CHAN,
+					 g_param_spec_object ("tp-chan",
+							      "telepathy channel",
+							      "The text channel for the chat",
+							      TELEPATHY_CHAN_TYPE,
+							      G_PARAM_READWRITE |
+							      G_PARAM_CONSTRUCT_ONLY));
+
+	g_object_class_install_property (object_class,
 					 PROP_CHANNEL,
 					 g_param_spec_object ("channel",
 							      "telepathy channel",
@@ -745,12 +761,11 @@
 empathy_tp_chat_new (McAccount *account,
 		     TpChan    *tp_chan)
 {
-	EmpathyTpChat     *chat;
-	EmpathyTpChatPriv *priv;
-	TpChannel         *channel;
-	TpConnection      *connection;
-	MissionControl    *mc;
-	TpConn            *tp_conn;
+	EmpathyTpChat  *chat;
+	TpChannel      *channel;
+	TpConnection   *connection;
+	MissionControl *mc;
+	TpConn         *tp_conn;
 
 	mc = empathy_mission_control_new ();
 	tp_conn = mission_control_get_connection (mc, account, NULL);
@@ -760,11 +775,9 @@
 	chat = g_object_new (EMPATHY_TYPE_TP_CHAT, 
 			     "account", account,
 			     "channel", channel,
+			     "tp-chan", tp_chan,
 			     NULL);
 
-	priv = GET_PRIV (chat);
-	priv->tp_chan = g_object_ref (tp_chan);
-
 	g_object_unref (channel);
 	g_object_unref (tp_conn);
 	g_object_unref (connection);

Modified: trunk/libempathy/empathy-tp-chatroom.c
==============================================================================
--- trunk/libempathy/empathy-tp-chatroom.c	(original)
+++ trunk/libempathy/empathy-tp-chatroom.c	Tue Mar 11 12:23:02 2008
@@ -202,6 +202,7 @@
 	chatroom = g_object_new (EMPATHY_TYPE_TP_CHATROOM,
 				 "account", account,
 				 "channel", channel,
+				 "tp-chan", tp_chan,
 				 NULL);
 
 	priv = GET_PRIV (chatroom);