[Telepathy-commits] [telepathy-glib/master] BaseConnection: move fail_channel_request out of channel factory callback section

[Will Thompson]

---
 telepathy-glib/base-connection.c |   40 +++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 048c36f..16fa0c8 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -631,6 +631,26 @@ factory_satisfy_requests (TpBaseConnection *conn,
 }
 
 
+static void
+fail_channel_request (TpBaseConnection *conn,
+                      ChannelRequest *request,
+                      GError *error)
+{
+  TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (conn);
+  DEBUG ("completing queued request %p with error, channel_type=%s, "
+      "handle_type=%u, handle=%u, suppress_handler=%u",
+      request, request->channel_type,
+      request->handle_type, request->handle, request->suppress_handler);
+
+  dbus_g_method_return_error (request->context, error);
+  request->context = NULL;
+
+  g_ptr_array_remove (priv->channel_requests, request);
+
+  channel_request_free (request);
+}
+
+
 /* Channel factory signal handlers */
 
 static void
@@ -664,26 +684,6 @@ factory_new_channel_cb (TpChannelFactoryIface *factory,
 
 
 static void
-fail_channel_request (TpBaseConnection *conn,
-                      ChannelRequest *request,
-                      GError *error)
-{
-  TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (conn);
-  DEBUG ("completing queued request %p with error, channel_type=%s, "
-      "handle_type=%u, handle=%u, suppress_handler=%u",
-      request, request->channel_type,
-      request->handle_type, request->handle, request->suppress_handler);
-
-  dbus_g_method_return_error (request->context, error);
-  request->context = NULL;
-
-  g_ptr_array_remove (priv->channel_requests, request);
-
-  channel_request_free (request);
-}
-
-
-static void
 factory_channel_error_cb (TpChannelFactoryIface *factory,
                           GObject *chan,
                           GError *error,
-- 
1.5.6.5