soc.2009.telepathy: f368ff87: Use EnsureChannel instead of CreateChann...

[sttwister at gmail.com]

-----------------------------------------------------------------
Revision: f368ff87730720eec2aa44624df4b89c361170ce
Ancestor: 54bc4c9e3e0efb75952e57bf5be37b7c3cf5ecd6
Author: sttwister at gmail.com
Date: 2009-10-14T17:16:33
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/f368ff87730720eec2aa44624df4b89c361170ce

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

ChangeLog: 

Use EnsureChannel instead of CreateChannel for IMs and chats

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy.c	8496868bf4dc9f71e3eab1b7a6993f18254eaea2
+++ libpurple/protocols/telepathy/telepathy.c	c7ea9a7a38c0092898f3c22a5747328491bead30
@@ -299,7 +299,7 @@ telepathy_send_im (PurpleConnection *gc,
 
 		purple_debug_info("telepathy", "Requesting text channel for %s\n", who);
 
-		tp_cli_channel_dispatcher_call_create_channel(channel_Dispatcher, -1,
+		tp_cli_channel_dispatcher_call_ensure_channel(channel_Dispatcher, -1,
 			tp_account->obj_Path, map, time(NULL), "",
 			create_channel_cb, data, NULL, NULL); 
 
@@ -542,7 +542,7 @@ telepathy_join_chat (PurpleConnection *g
 
 		purple_debug_info("telepathy", "Requesting room text channel for %s\n", name);
 
-		tp_cli_channel_dispatcher_call_create_channel(channel_Dispatcher, -1,
+		tp_cli_channel_dispatcher_call_ensure_channel(channel_Dispatcher, -1,
 			account_data->obj_Path, map, time(NULL), "",
 			create_channel_cb, data, NULL, NULL);
 
============================================================
--- libpurple/protocols/telepathy/telepathy_account.c	384e8a0fb43a6c434e00d1118801e6b9d05f32d2
+++ libpurple/protocols/telepathy/telepathy_account.c	52856ee83121fab95ae463073a4df1ce17612847
@@ -26,6 +26,7 @@
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>