soc.2009.telepathy: f6ded69b: Removed old connection code

[sttwister at gmail.com]

-----------------------------------------------------------------
Revision: f6ded69b290ec2b9f12f4b74f39ec2d370024bb3
Ancestor: a3266b5dd4a52811c4d7c65b838d8c65b25700a2
Author: sttwister at gmail.com
Date: 2009-08-10T11:20:49
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/f6ded69b290ec2b9f12f4b74f39ec2d370024bb3

Modified files:
        libpurple/protocols/telepathy/telepathy_channel.c
        libpurple/protocols/telepathy/telepathy_channel.h
        libpurple/protocols/telepathy/telepathy_connection.c
        libpurple/protocols/telepathy/telepathy_connection.h

ChangeLog: 

Removed old connection code

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy_channel.c	f3818c7df5370e5801880dd26e958c84823bda3c
+++ libpurple/protocols/telepathy/telepathy_channel.c	263e5a41751e203866c160ac492e8c5912e2efcc
@@ -196,21 +196,6 @@ void
 }
 
 void
-ensure_channel_cb (TpConnection *proxy,
-                   gboolean out_Yours,
-                   const gchar *out_Channel,
-                   GHashTable *out_Properties,
-                   const GError *error,
-                   gpointer user_data,
-                   GObject *weak_object)
-{
-	if (error != NULL)
-	{
-		purple_debug_error("telepathy", "EnsureChannel error: %s\n", error->message);
-	}
-}
-
-void
 get_channels_cb (TpProxy *proxy,
                  const GValue *out_Value,
                  const GError *error,
============================================================
--- libpurple/protocols/telepathy/telepathy_channel.h	60378fed9ff34438c8537ef5e6946d09d9d4d012
+++ libpurple/protocols/telepathy/telepathy_channel.h	f58e52d4e535e193c34e9e07ccadce36e3a209b3
@@ -58,15 +58,6 @@ void
                  GObject *weak_object);
 
 void
-ensure_channel_cb (TpConnection *proxy,
-                   gboolean out_Yours,
-                   const gchar *out_Channel,
-                   GHashTable *out_Properties,
-                   const GError *error,
-                   gpointer user_data,
-                   GObject *weak_object);
-
-void
 get_channels_cb (TpProxy *proxy,
                  const GValue *out_Value,
                  const GError *error,
============================================================
--- libpurple/protocols/telepathy/telepathy_connection.c	37ed27522a641a10a4e2797535b1f1b0938db81a
+++ libpurple/protocols/telepathy/telepathy_connection.c	492f61e2a88a1f8c88004d9831f9bf97a8189586
@@ -405,94 +405,6 @@ void
 }
 
 void
-connection_connect_cb (TpConnection *proxy,
-                       const GError *error,
-                       gpointer user_data,
-                       GObject *weak_object)
-{
-	/* if this fails, something must be broken somewhere */
-	if (error != NULL)
-	{
-		purple_debug_error("telepathy", "Connect error: %s\n", error->message);
-	}
-}
-
-void
-request_connection_cb (TpConnectionManager *proxy,
-                       const gchar *out_Bus_Name,
-                       const gchar *out_Object_Path,
-                       const GError *error,
-                       gpointer user_data,
-                       GObject *weak_object)
-{
-	PurpleConnection *gc = user_data;
-
-	if (error != NULL)
-	{
-		purple_debug_info("telepathy", "RequestConnection error: %s\n", error->message);
-
-		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, error->message);
-	}
-	else
-	{
-		GError *error = NULL;
-		telepathy_connection *connection_data;
-
-		TpDBusDaemon *daemon = tp_dbus_daemon_dup(&error);
-		
-		if (error != NULL)
-		{
-			purple_debug_error("telepathy", "Error creating dbus daemon: %s\n", error->message);
-			g_error_free(error);
-			return;
-		}
-
-		connection_data = g_new0(telepathy_connection, 1);
-
-		/* get the connection proxy straight out of the dbus interface */
-		connection_data->connection = tp_connection_new(daemon, out_Bus_Name, out_Object_Path, &error);
-		connection_data->gc = gc;
-		connection_data->acct = purple_connection_get_account(gc);
-		purple_connection_set_protocol_data(gc, connection_data);
-
-		if (error != NULL)
-		{
-			purple_debug_error("telepathy", "Error creating TpConnection object: %s\n", error->message);
-			g_error_free(error);
-
-			g_object_unref(connection_data->connection);
-			connection_data->connection = NULL;
-			g_free(connection_data);
-			return;
-		}
-
-		tp_connection_call_when_ready(connection_data->connection, connection_ready_cb, connection_data);
-
-		/* this will indicate any connection status change, also providing a reason */
-		tp_cli_connection_connect_to_status_changed(connection_data->connection, status_changed_cb, connection_data, NULL, NULL, &error);
-
-		if (error != NULL)
-		{
-			purple_debug_error("telepathy", "Error conencting to StatusChanged: %s\n", error->message);
-			g_error_free(error);
-
-			tp_cli_connection_call_disconnect(connection_data->connection, -1, NULL, NULL, NULL, NULL);
-			g_object_unref(connection_data->connection);
-			connection_data->connection = NULL;
-			g_free(connection_data);
-		}
-		else
-		{
-			/* do some magic now :) */
-			tp_cli_connection_call_connect(connection_data->connection, -1, connection_connect_cb, connection_data, NULL, NULL);
-		}
-
-		if (daemon != NULL)
-			g_object_unref(daemon);
-	}
-}
-
-void
 connection_ready_cb (TpConnection *connection,
                      const GError *error,
                      gpointer user_data)
============================================================
--- libpurple/protocols/telepathy/telepathy_connection.h	506c2cc1efd89c5189fc16422ca8a218c1f5ef55
+++ libpurple/protocols/telepathy/telepathy_connection.h	a28ef59e3f6a0e6f6e723da33dbf0113f1dc05c8
@@ -88,20 +88,6 @@ void
                  GObject *weak_object);
 
 void
-connection_connect_cb (TpConnection *proxy,
-                       const GError *error,
-                       gpointer user_data,
-                       GObject *weak_object);
-
-void
-request_connection_cb (TpConnectionManager *proxy,
-                       const gchar *out_Bus_Name,
-                       const gchar *out_Object_Path,
-                       const GError *error,
-                       gpointer user_data,
-                       GObject *weak_object);
-
-void
 connection_ready_cb (TpConnection *connection,
                      const GError *error,
                      gpointer user_data);