[empathy/next] TpObserveChannelsContext has been renamed TpObserveChannelContext

[Guillaume Desmottes <gdesmott src gnome org>]

commit e89036a9a890e27b0309fbca4d401e8d2e58159c
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jan 27 13:39:48 2014 +0100

    TpObserveChannelsContext has been renamed TpObserveChannelContext

 libempathy-gtk/empathy-log-window.c   |    4 ++--
 libempathy/empathy-auth-factory.c     |   20 ++++++++++----------
 libempathy/empathy-chatroom-manager.c |    6 +++---
 src/empathy-call-observer.c           |   14 +++++++-------
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 9ff417e..9b58444 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -997,7 +997,7 @@ observe_channels (TpSimpleObserver *observer,
     GList *channels,
     TpChannelDispatchOperation *dispatch_operation,
     GList *requests,
-    TpObserveChannelsContext *context,
+    TpObserveChannelContext *context,
     gpointer user_data)
 {
   EmpathyLogWindow *self = user_data;
@@ -1037,7 +1037,7 @@ observe_channels (TpSimpleObserver *observer,
         }
     }
 
-  tp_observe_channels_context_accept (context);
+  tp_observe_channel_context_accept (context);
 }
 
 static void
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 8ce6586..ffab08d 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -379,7 +379,7 @@ handle_channels (TpBaseClient *handler,
 typedef struct
 {
   EmpathyAuthFactory *self;
-  TpObserveChannelsContext *context;
+  TpObserveChannelContext *context;
   TpChannelDispatchOperation *dispatch_operation;
   TpAccount *account;
   TpChannel *channel;
@@ -439,7 +439,7 @@ get_password_cb (GObject *source,
       DEBUG ("We don't have a password for account %s, letting the event "
           "manager approver take it", tp_proxy_get_object_path (source));
 
-      tp_observe_channels_context_accept (data->context);
+      tp_observe_channel_context_accept (data->context);
       observe_channels_data_free (data);
     }
   else
@@ -450,7 +450,7 @@ get_password_cb (GObject *source,
       tp_channel_dispatch_operation_claim_with_async (data->dispatch_operation,
           TP_BASE_CLIENT (data->self), password_claim_cb, data);
 
-      tp_observe_channels_context_accept (data->context);
+      tp_observe_channel_context_accept (data->context);
     }
 }
 
@@ -513,7 +513,7 @@ observe_channels (TpBaseClient *client,
     GList *channels,
     TpChannelDispatchOperation *dispatch_operation,
     GList *requests,
-    TpObserveChannelsContext *context)
+    TpObserveChannelContext *context)
 {
   EmpathyAuthFactory *self = EMPATHY_AUTH_FACTORY (client);
   TpChannel *channel;
@@ -525,7 +525,7 @@ observe_channels (TpBaseClient *client,
   if (!common_checks (self, channels, TRUE, &error))
     {
       DEBUG ("Failed checks: %s", error->message);
-      tp_observe_channels_context_fail (context, error);
+      tp_observe_channel_context_fail (context, error);
       g_clear_error (&error);
       return;
     }
@@ -549,7 +549,7 @@ observe_channels (TpBaseClient *client,
 
       tp_channel_dispatch_operation_claim_with_async (dispatch_operation,
           client, goa_claim_cb, data);
-      tp_observe_channels_context_accept (context);
+      tp_observe_channel_context_accept (context);
       return;
     }
 #endif /* HAVE_GOA */
@@ -563,7 +563,7 @@ observe_channels (TpBaseClient *client,
 
       tp_channel_dispatch_operation_claim_with_async (dispatch_operation,
           client, uoa_claim_cb, data);
-      tp_observe_channels_context_accept (context);
+      tp_observe_channel_context_accept (context);
       return;
     }
 #endif /* HAVE_UOA */
@@ -580,20 +580,20 @@ observe_channels (TpBaseClient *client,
           tp_channel_dispatch_operation_claim_with_async (dispatch_operation,
               client, password_claim_cb, data);
 
-          tp_observe_channels_context_accept (context);
+          tp_observe_channel_context_accept (context);
           return;
         }
 
       tpaw_keyring_get_account_password_async (data->account,
           get_password_cb, data);
-      tp_observe_channels_context_delay (context);
+      tp_observe_channel_context_delay (context);
       return;
     }
 
   /* Unknown auth */
   error = g_error_new_literal (TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
       "Unknown auth mechanism");
-  tp_observe_channels_context_fail (context, error);
+  tp_observe_channel_context_fail (context, error);
   g_clear_error (&error);
 
   observe_channels_data_free (data);
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 0f79178..81db302 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -46,7 +46,7 @@ static void observe_channels_cb (TpSimpleObserver *observer,
     GList *channels,
     TpChannelDispatchOperation *dispatch_operation,
     GList *requests,
-    TpObserveChannelsContext *context,
+    TpObserveChannelContext *context,
     gpointer user_data);
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroomManager)
@@ -867,7 +867,7 @@ observe_channels_cb (TpSimpleObserver *observer,
     GList *channels,
     TpChannelDispatchOperation *dispatch_operation,
     GList *requests,
-    TpObserveChannelsContext *context,
+    TpObserveChannelContext *context,
     gpointer user_data)
 {
   EmpathyChatroomManager *self = user_data;
@@ -903,5 +903,5 @@ observe_channels_cb (TpSimpleObserver *observer,
         self);
     }
 
-  tp_observe_channels_context_accept (context);
+  tp_observe_channel_context_accept (context);
 }
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 06ff764..85c31aa 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -67,13 +67,13 @@ on_channel_closed (TpProxy *proxy,
 typedef struct
 {
   EmpathyCallObserver *self;
-  TpObserveChannelsContext *context;
+  TpObserveChannelContext *context;
   TpChannel *main_channel;
 } AutoRejectCtx;
 
 static AutoRejectCtx *
 auto_reject_ctx_new (EmpathyCallObserver *self,
-    TpObserveChannelsContext *context,
+    TpObserveChannelContext *context,
     TpChannel *main_channel)
 {
   AutoRejectCtx *ctx = g_slice_new (AutoRejectCtx);
@@ -206,7 +206,7 @@ observe_channels (TpSimpleObserver *observer,
     GList *channels,
     TpChannelDispatchOperation *dispatch_operation,
     GList *requests,
-    TpObserveChannelsContext *context,
+    TpObserveChannelContext *context,
     gpointer user_data)
 {
   EmpathyCallObserver *self = EMPATHY_CALL_OBSERVER (user_data);
@@ -221,7 +221,7 @@ observe_channels (TpSimpleObserver *observer,
 
       DEBUG ("Didn't find any Call channel; ignoring");
 
-      tp_observe_channels_context_fail (context, &err);
+      tp_observe_channel_context_fail (context, &err);
       return;
     }
 
@@ -237,7 +237,7 @@ observe_channels (TpSimpleObserver *observer,
           TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Already in a call",
           claim_and_leave_cb, ctx);
 
-      tp_observe_channels_context_accept (context);
+      tp_observe_channel_context_accept (context);
       return;
     }
 
@@ -246,7 +246,7 @@ observe_channels (TpSimpleObserver *observer,
       DEBUG ("The channel has already been invalidated: %s",
           error->message);
 
-      tp_observe_channels_context_fail (context, error);
+      tp_observe_channel_context_fail (context, error);
       return;
     }
 
@@ -257,7 +257,7 @@ observe_channels (TpSimpleObserver *observer,
   self->priv->channels = g_list_prepend (self->priv->channels,
       g_object_ref (channel));
 
-  tp_observe_channels_context_accept (context);
+  tp_observe_channel_context_accept (context);
 }
 
 static GObject *