[kdbus] Integrate kdbus core with new API.

[platform/upstream/glib.git] / gio / gsocketservice.c

diff --git a/gio/gsocketservice.c b/gio/gsocketservice.c
index 96a4342..81053f0 100644 (file)
--- a/gio/gsocketservice.c
+++ b/gio/gsocketservice.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt@desrt.ca>
  *          Alexander Larsson <alexl@redhat.com>
@@ -26,6 +24,7 @@
  * SECTION:gsocketservice
  * @title: GSocketService
  * @short_description: Make it easy to implement a network service
+ * @include: gio/gio.h
  * @see_also: #GThreadedSocketService, #GSocketListener.
  *
  * A #GSocketService is an object that represents a service that
@@ -48,9 +47,11 @@
  * If you are interested in writing connection handlers that contain
  * blocking code then see #GThreadedSocketService.
  *
- * The socket service runs on the main loop in the main thread, and is
- * not threadsafe in general. However, the calls to start and stop
- * the service are threadsafe so these can be used from threads that
+ * The socket service runs on the main loop of the 
+ * [thread-default context][g-main-context-push-thread-default-context]
+ * of the thread it is created in, and is not
+ * threadsafe in general. However, the calls to start and stop the
+ * service are thread-safe so these can be used from threads that
  * handle incoming clients.
  *
  * Since: 2.22
@@ -63,13 +64,6 @@
 #include "gsocketlistener.h"
 #include "gsocketconnection.h"
 
-
-static guint g_socket_service_incoming_signal;
-
-G_DEFINE_TYPE (GSocketService, g_socket_service, G_TYPE_SOCKET_LISTENER);
-
-G_LOCK_DEFINE_STATIC(active);
-
 struct _GSocketServicePrivate
 {
   GCancellable *cancellable;
@@ -77,6 +71,12 @@ struct _GSocketServicePrivate
   guint outstanding_accept : 1;
 };
 
+static guint g_socket_service_incoming_signal;
+
+G_LOCK_DEFINE_STATIC(active);
+
+G_DEFINE_TYPE_WITH_PRIVATE (GSocketService, g_socket_service, G_TYPE_SOCKET_LISTENER)
+
 static void g_socket_service_ready (GObject      *object,
                                    GAsyncResult *result,
                                    gpointer      user_data);
@@ -92,9 +92,7 @@ g_socket_service_real_incoming (GSocketService    *service,
 static void
 g_socket_service_init (GSocketService *service)
 {
-  service->priv = G_TYPE_INSTANCE_GET_PRIVATE (service,
-                                              G_TYPE_SOCKET_SERVICE,
-                                              GSocketServicePrivate);
+  service->priv = g_socket_service_get_instance_private (service);
   service->priv->cancellable = g_cancellable_new ();
   service->priv->active = TRUE;
 }
@@ -131,11 +129,7 @@ g_socket_service_changed (GSocketListener *listener)
       if (service->priv->outstanding_accept)
        g_cancellable_cancel (service->priv->cancellable);
       else
-       {
-         g_socket_listener_accept_async (listener, service->priv->cancellable,
-                                         g_socket_service_ready, NULL);
-         service->priv->outstanding_accept = TRUE;
-       }
+       do_accept (service);
     }
 
   G_UNLOCK (active);
@@ -172,7 +166,7 @@ g_socket_service_is_active (GSocketService *service)
  * Starts the service, i.e. start accepting connections
  * from the added sockets when the mainloop runs.
  *
- * This call is threadsafe, so it may be called from a thread
+ * This call is thread-safe, so it may be called from a thread
  * handling an incoming client request.
  *
  * Since: 2.22
@@ -202,9 +196,15 @@ g_socket_service_start (GSocketService *service)
  * Stops the service, i.e. stops accepting connections
  * from the added sockets when the mainloop runs.
  *
- * This call is threadsafe, so it may be called from a thread
+ * This call is thread-safe, so it may be called from a thread
  * handling an incoming client request.
  *
+ * Note that this only stops accepting new connections; it does not
+ * close the listening sockets, and you can call
+ * g_socket_service_start() again later to begin listening again. To
+ * close the listening sockets, call g_socket_listener_close(). (This
+ * will happen automatically when the #GSocketService is finalized.)
+ *
  * Since: 2.22
  */
 void
@@ -242,8 +242,6 @@ g_socket_service_class_init (GSocketServiceClass *class)
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GSocketListenerClass *listener_class = G_SOCKET_LISTENER_CLASS (class);
 
-  g_type_class_add_private (class, sizeof (GSocketServicePrivate));
-
   gobject_class->finalize = g_socket_service_finalize;
   listener_class->changed = g_socket_service_changed;
   class->incoming = g_socket_service_real_incoming;
@@ -252,7 +250,8 @@ g_socket_service_class_init (GSocketServiceClass *class)
    * GSocketService::incoming:
    * @service: the #GSocketService
    * @connection: a new #GSocketConnection object
-   * @source_object: the source_object passed to g_socket_listener_add_address()
+   * @source_object: (allow-none): the source_object passed to
+   *     g_socket_listener_add_address()
    *
    * The ::incoming signal is emitted when a new incoming connection
    * to @service needs to be handled. The handler must initiate the