[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / glib / gmain.h

diff --git a/glib/gmain.h b/glib/gmain.h
index 558910a..603fdfc 100644 (file)
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_MAIN_H__
@@ -44,7 +42,7 @@ typedef enum /*< flags >*/
 /**
  * GMainContext:
  *
- * The <structname>GMainContext</structname> struct is an opaque data
+ * The `GMainContext` struct is an opaque data
  * type representing a set of sources to be handled in a main loop.
  */
 typedef struct _GMainContext            GMainContext;
@@ -52,7 +50,7 @@ typedef struct _GMainContext            GMainContext;
 /**
  * GMainLoop:
  *
- * The <structname>GMainLoop</structname> struct is an opaque data type
+ * The `GMainLoop` struct is an opaque data type
  * representing the main event loop of a GLib or GTK+ application.
  */
 typedef struct _GMainLoop               GMainLoop;
@@ -60,7 +58,7 @@ typedef struct _GMainLoop               GMainLoop;
 /**
  * GSource:
  *
- * The <structname>GSource</structname> struct is an opaque data type
+ * The `GSource` struct is an opaque data type
  * representing an event source.
  */
 typedef struct _GSource                 GSource;
@@ -73,7 +71,7 @@ typedef struct _GSourcePrivate          GSourcePrivate;
  * @get: Called to extract the callback function and data from the
  *     callback object.
 
- * The <structname>GSourceCallbackFuncs</structname> struct contains
+ * The `GSourceCallbackFuncs` struct contains
  * functions for managing callback objects.
  */
 typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
@@ -85,18 +83,18 @@ typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
  *     results of the poll() call) it should return %TRUE. It can also return
  *     a @timeout_ value which should be the maximum timeout (in milliseconds)
  *     which should be passed to the poll() call. The actual timeout used will
- *     be -1 if all sources returned -1, or it will be the minimum of all the
- *     @timeout_ values returned which were >= 0.  Since 2.36 this may
- *     be %NULL, in which case the effect is as if the function always
- *     returns %FALSE with a timeout of -1.  If @prepare returns a
+ *     be -1 if all sources returned -1, or it will be the minimum of all
+ *     the @timeout_ values returned which were >= 0.  Since 2.36 this may
+ *     be %NULL, in which case the effect is as if the function always returns
+ *     %FALSE with a timeout of -1.  If @prepare returns a
  *     timeout and the source also has a 'ready time' set then the
  *     nearer of the two will be used.
  * @check: Called after all the file descriptors are polled. The source
  *     should return %TRUE if it is ready to be dispatched. Note that some
  *     time may have passed since the previous prepare function was called,
  *     so the source should be checked again here.  Since 2.36 this may
- *     be %NULL, in which case the effect is as if the function always
- *     returns %FALSE.
+ *     be %NULL, in which case the effect is as if the function always returns
+ *     %FALSE.
  * @dispatch: Called to dispatch the event source, after it has returned
  *     %TRUE in either its @prepare or its @check function. The @dispatch
  *     function is passed in a callback function and data. The callback
@@ -106,7 +104,7 @@ typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
  *     are needed for this type of event source.
  * @finalize: Called when the source is finalized.
  *
- * The <structname>GSourceFuncs</structname> struct contains a table of
+ * The `GSourceFuncs` struct contains a table of
  * functions used to handle event sources in a generic manner.
  *
  * For idle sources, the prepare and check functions always return %TRUE