[gnio] Rearrange argument order so GCancellable is before GError

[Alexander Larsson <alexl src gnome org>]

commit 3aaab444c19e7e1bbf0eb55c8b552af652eff48e
Author: Alexander Larsson <alexl redhat com>
Date:   Fri May 15 20:09:40 2009 +0200

    Rearrange argument order so GCancellable is before GError
    
    This is consistent with other APIs in gio.
---
 gio/gsocketlistener.c |   10 +++++-----
 gio/gsocketlistener.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c
index 24802e1..a0ef283 100644
--- a/gio/gsocketlistener.c
+++ b/gio/gsocketlistener.c
@@ -435,8 +435,8 @@ accept_callback (GSocket *socket,
 /**
  * g_socket_listener_accept_socket:
  * @listener: a #GSocketListener
- * @cancellable: optional #GCancellable object, %NULL to ignore.
  * @source_object: location where #GObject pointer will be stored, or %NULL
+ * @cancellable: optional #GCancellable object, %NULL to ignore.
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Blocks waiting for a client to connect to any of the sockets added
@@ -460,8 +460,8 @@ accept_callback (GSocket *socket,
  **/
 GSocket *
 g_socket_listener_accept_socket (GSocketListener  *listener,
-				 GCancellable     *cancellable,
 				 GObject         **source_object,
+				 GCancellable     *cancellable,
 				 GError          **error)
 {
   GSocket *accept_socket, *socket;
@@ -512,8 +512,8 @@ g_socket_listener_accept_socket (GSocketListener  *listener,
 /**
  * g_socket_listener_accept:
  * @listener: a #GSocketListener
- * @cancellable: optional #GCancellable object, %NULL to ignore.
  * @source_object: location where #GObject pointer will be stored, or %NULL
+ * @cancellable: optional #GCancellable object, %NULL to ignore.
  * @error: #GError for error reporting, or %NULL to ignore.
  *
  * Blocks waiting for a client to connect to any of the sockets added
@@ -534,16 +534,16 @@ g_socket_listener_accept_socket (GSocketListener  *listener,
  **/
 GSocketConnection *
 g_socket_listener_accept (GSocketListener  *listener,
-			  GCancellable     *cancellable,
 			  GObject         **source_object,
+			  GCancellable     *cancellable,
 			  GError          **error)
 {
   GSocketConnection *connection;
   GSocket *socket;
 
   socket = g_socket_listener_accept_socket (listener,
-					    cancellable,
 					    source_object,
+					    cancellable,
 					    error);
   if (socket == NULL)
     return NULL;
diff --git a/gio/gsocketlistener.h b/gio/gsocketlistener.h
index 6f92e56..3a9e1bc 100644
--- a/gio/gsocketlistener.h
+++ b/gio/gsocketlistener.h
@@ -108,8 +108,8 @@ gboolean                g_socket_listener_add_inet_port                 (GSocket
 									 GError             **error);
 
 GSocket *               g_socket_listener_accept_socket                 (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
 									 GObject             **source_object,
+                                                                         GCancellable         *cancellable,
                                                                          GError              **error);
 void                    g_socket_listener_accept_socket_async           (GSocketListener      *listener,
                                                                          GCancellable         *cancellable,
@@ -122,8 +122,8 @@ GSocket *               g_socket_listener_accept_socket_finish          (GSocket
 
 
 GSocketConnection *     g_socket_listener_accept                        (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
 									 GObject             **source_object,
+                                                                         GCancellable         *cancellable,
                                                                          GError              **error);
 
 void                    g_socket_listener_accept_async                  (GSocketListener      *listener,