[empathy/next] TpHandleChannelsContext has been renamed to TpHandleChannelContext

[Guillaume Desmottes <gdesmott src gnome org>]

commit 71420771f94557ef7a75d9a6d3584f00b00fd336
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jan 27 13:54:27 2014 +0100

    TpHandleChannelsContext has been renamed to TpHandleChannelContext

 libempathy/empathy-auth-factory.c |   20 ++++++++++----------
 libempathy/empathy-ft-factory.c   |    4 ++--
 src/empathy-call-factory.c        |    6 +++---
 src/empathy-chat-manager.c        |    4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 9ce73bd..70cbaf6 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -84,7 +84,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
 static EmpathyAuthFactory *auth_factory_singleton = NULL;
 
 typedef struct {
-  TpHandleChannelsContext *context;
+  TpHandleChannelContext *context;
   EmpathyAuthFactory *self;
 } HandlerContextData;
 
@@ -99,7 +99,7 @@ handler_context_data_free (HandlerContextData *data)
 
 static HandlerContextData *
 handler_context_data_new (EmpathyAuthFactory *self,
-    TpHandleChannelsContext *context)
+    TpHandleChannelContext *context)
 {
   HandlerContextData *data;
 
@@ -127,13 +127,13 @@ server_tls_handler_ready_cb (GObject *source,
     {
       DEBUG ("Failed to create a server TLS handler; error %s",
           error->message);
-      tp_handle_channels_context_fail (data->context, error);
+      tp_handle_channel_context_fail (data->context, error);
 
       g_error_free (error);
     }
   else
     {
-      tp_handle_channels_context_accept (data->context);
+      tp_handle_channel_context_accept (data->context);
       g_signal_emit (data->self, signals[NEW_SERVER_TLS_HANDLER], 0,
           handler);
 
@@ -191,7 +191,7 @@ server_sasl_handler_ready_cb (GObject *source,
           error->message);
 
       if (data->context != NULL)
-        tp_handle_channels_context_fail (data->context, error);
+        tp_handle_channel_context_fail (data->context, error);
 
       g_error_free (error);
     }
@@ -202,7 +202,7 @@ server_sasl_handler_ready_cb (GObject *source,
       TpAccount *account;
 
       if (data->context != NULL)
-        tp_handle_channels_context_accept (data->context);
+        tp_handle_channel_context_accept (data->context);
 
       channel = empathy_server_sasl_handler_get_channel (handler);
       g_assert (channel != NULL);
@@ -308,7 +308,7 @@ handle_channels (TpBaseClient *handler,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context)
+    TpHandleChannelContext *context)
 {
   TpChannel *channel;
   GError *error = NULL;
@@ -320,7 +320,7 @@ handle_channels (TpBaseClient *handler,
   if (!common_checks (self, channels->data, FALSE, &error))
     {
       DEBUG ("Failed checks: %s", error->message);
-      tp_handle_channels_context_fail (context, error);
+      tp_handle_channel_context_fail (context, error);
       g_clear_error (&error);
       return;
     }
@@ -337,13 +337,13 @@ handle_channels (TpBaseClient *handler,
       g_set_error_literal (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Only the X-TELEPATHY-PASSWORD SASL mechanism is supported");
       DEBUG ("%s", error->message);
-      tp_handle_channels_context_fail (context, error);
+      tp_handle_channel_context_fail (context, error);
       g_clear_error (&error);
       return;
     }
 
   data = handler_context_data_new (self, context);
-  tp_handle_channels_context_delay (context);
+  tp_handle_channel_context_delay (context);
 
   /* create a handler */
   if (tp_channel_get_channel_type_id (channel) ==
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 9b95972..dfc237b 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -168,7 +168,7 @@ handle_channels_cb (TpSimpleHandler *handler,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context,
+    TpHandleChannelContext *context,
     gpointer user_data)
 {
   EmpathyFTFactory *self = user_data;
@@ -190,7 +190,7 @@ handle_channels_cb (TpSimpleHandler *handler,
     }
 
 
-  tp_handle_channels_context_accept (context);
+  tp_handle_channel_context_accept (context);
 }
 
 static void
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 58233b0..8dcfdf8 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -38,7 +38,7 @@ static void handle_channels (TpBaseClient *client,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context);
+    TpHandleChannelContext *context);
 
 static void approve_channels (TpBaseClient *client,
     TpAccount *account,
@@ -183,7 +183,7 @@ handle_channels (TpBaseClient *client,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context)
+    TpHandleChannelContext *context)
 {
   EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
   GList *l;
@@ -219,7 +219,7 @@ handle_channels (TpBaseClient *client,
       g_object_unref (contact);
     }
 
-  tp_handle_channels_context_accept (context);
+  tp_handle_channel_context_accept (context);
 }
 
 static TpCallChannel *
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 5593463..812dbe8 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -243,7 +243,7 @@ handle_channels (TpSimpleHandler *handler,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context,
+    TpHandleChannelContext *context,
     gpointer user_data)
 {
   EmpathyChatManager *self = (EmpathyChatManager *) user_data;
@@ -268,7 +268,7 @@ handle_channels (TpSimpleHandler *handler,
       process_tp_chat (self, tp_chat, account, user_action_time);
     }
 
-  tp_handle_channels_context_accept (context);
+  tp_handle_channel_context_accept (context);
 }
 
 static void