soc.2009.telepathy: 89871def: Request chat channels via ChannelDispatc...

[sttwister at gmail.com]

-----------------------------------------------------------------
Revision: 89871def1e2cb38073ed8a2e1765555d3206df29
Ancestor: bd253c0766d5b766a489c89d47c4f3e342116dc9
Author: sttwister at gmail.com
Date: 2009-08-09T17:22:44
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/89871def1e2cb38073ed8a2e1765555d3206df29

Modified files:
        libpurple/protocols/telepathy/telepathy.c

ChangeLog: 

Request chat channels via ChannelDispatcher

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy.c	9b0cbe15175fc911c5bb4394b52c5a9508f20e3f
+++ libpurple/protocols/telepathy/telepathy.c	2a0862fd5c81fd7fc167ab27a60d3365b754db8d
@@ -314,14 +314,15 @@ telepathy_send_typing (PurpleConnection 
 	telepathy_connection *data = purple_connection_get_protocol_data(gc);
 	TpChannel *channel = NULL;
 	TpChannelChatState tp_state;
+	telepathy_text_channel *tp_channel;
 	
 	if (data == NULL)
 	{
 		purple_debug_error("telepathy", "PurpleConnection has no protocol data!\n");
-		return;
+		return 0;
 	}
 
-	telepathy_text_channel *tp_channel = g_hash_table_lookup(data->text_Channels, name);
+	tp_channel = g_hash_table_lookup(data->text_Channels, name);
 
 	if (tp_channel == NULL)
 	{
@@ -509,6 +510,8 @@ telepathy_join_chat (PurpleConnection *g
 	/* Is this a channel the user requested? */
 	if (tp_channel == NULL)
 	{
+		telepathy_account *account_data = data->account_data;
+
 		/* Request a room text channel */
 		GHashTable *map = tp_asv_new (
 			TP_IFACE_CHANNEL ".ChannelType",G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
@@ -518,8 +521,9 @@ telepathy_join_chat (PurpleConnection *g
 
 		purple_debug_info("telepathy", "Requesting room text channel for %s\n", name);
 
-		tp_cli_connection_interface_requests_call_ensure_channel(data->connection, -1,
-				map, ensure_channel_cb, data, NULL, NULL);
+		tp_cli_channel_dispatcher_call_create_channel(channel_Dispatcher, -1,
+			account_data->obj_Path, map, time(NULL), "",
+			create_channel_cb, data, NULL, NULL);
 	}
 	else
 	{