2.34.0

[platform/upstream/at-spi2-core.git] / atspi / atspi-gmain.c

diff --git a/atspi/atspi-gmain.c b/atspi/atspi-gmain.c
index bb68c65..8d74442 100644 (file)
--- a/atspi/atspi-gmain.c
+++ b/atspi/atspi-gmain.c
@@ -8,7 +8,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,15 +33,7 @@
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
 #define N_(x) x
 
-/**
- * @defgroup DBusGLibInternals GLib bindings implementation details
- * @ingroup  DBusInternals
- * @brief Implementation details of GLib bindings
- *
- * @{
- */
-
-/**
+/*
  * DBusGMessageQueue:
  * A GSource subclass for dispatching DBusConnection messages.
  * We need this on top of the IO handlers, because sometimes
@@ -49,8 +41,8 @@
  */
 typedef struct
 {
-  GSource source; /**< the parent GSource */
-  DBusConnection *connection; /**< the connection to dispatch */
+  GSource source; /* the parent GSource */
+  DBusConnection *connection; /* the connection to dispatch */
 } DBusGMessageQueue;
 
 static gboolean message_queue_prepare  (GSource     *source,
@@ -103,11 +95,11 @@ message_queue_dispatch (GSource     *source,
 
 typedef struct
 {
-  GMainContext *context;      /**< the main context */
-  GSList *ios;                /**< all IOHandler */
-  GSList *timeouts;           /**< all TimeoutHandler */
-  DBusConnection *connection; /**< NULL if this is really for a server not a connection */
-  GSource *message_queue_source; /**< DBusGMessageQueue */
+  GMainContext *context;      /* the main context */
+  GSList *ios;                /* all IOHandler */
+  GSList *timeouts;           /* all TimeoutHandler */
+  DBusConnection *connection; /* NULL if this is really for a server not a connection */
+  GSource *message_queue_source; /* DBusGMessageQueue */
 } ConnectionSetup;
 
 
@@ -351,8 +343,6 @@ connection_setup_add_timeout (ConnectionSetup *cs,
   if (!dbus_timeout_get_enabled (timeout))
     return;
   
-  g_assert (dbus_timeout_get_data (timeout) == NULL);
-
   handler = g_new0 (TimeoutHandler, 1);
   handler->cs = cs;
   handler->timeout = timeout;
@@ -520,14 +510,10 @@ connection_setup_new_from_old (GMainContext    *context,
   return cs;
 }
 
-/** @} */ /* End of GLib bindings internals */
-
-/** @addtogroup DBusGLib
- * @{
- */
+/* @} */ /* End of GLib bindings internals */
 
 /**
- * atspi_dbus_connection_setup_with_g_main:
+ * atspi_dbus_connection_setup_with_g_main: (skip)
  * @connection: the connection
  * @context: the #GMainContext or #NULL for default context
  *
@@ -605,7 +591,7 @@ atspi_dbus_connection_setup_with_g_main (DBusConnection *connection,
 }
 
 /**
- * atspi_dbus_server_setup_with_g_main:
+ * atspi_dbus_server_setup_with_g_main: (skip)
  * @server: the server
  * @context: the #GMainContext or #NULL for default
  *