diff options
| author | Colin Walters <walters@verbum.org> | 2009-08-18 14:35:10 -0400 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2009-12-16 17:22:01 -0200 |
| commit | 18dc96caf883cad9226cb6e783dd930a7fe62c2e (patch) | |
| tree | 2319c7b1f06738781af07d034672ba61d0a78cd3 /gdk/gdkdisplaymanager.c | |
| parent | 78758d43ea1c2d3e87050eae078e679281d09106 (diff) | |
| download | gtk+-18dc96caf883cad9226cb6e783dd930a7fe62c2e.tar.gz | |
Merge in Gdk-custom.c introspection annotations
The Gdk-custom.c file in gir-repository contained a number of
introspection annotations. Merge those into the GDK source files.
Some documentation was moved from the tmpl/ files to accomodate
the addition of annotations.
https://bugzilla.gnome.org/show_bug.cgi?id=592279
Diffstat (limited to 'gdk/gdkdisplaymanager.c')
| -rw-r--r-- | gdk/gdkdisplaymanager.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 0f9a094eb9..e10adc689f 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -147,11 +147,12 @@ gdk_display_manager_get_property (GObject *object, } } -/** +/** * gdk_display_manager_get: - * @returns: the singleton #GdkDisplayManager object. * - * Returns the global #GdkDisplayManager singleton; gdk_parse_pargs(), + * Gets the singleton #GdkDisplayManager object. + * + * Returns: (transfer none): The global #GdkDisplayManager singleton; gdk_parse_pargs(), * gdk_init(), or gdk_init_check() must have been called first. * * Since: 2.2 @@ -171,9 +172,9 @@ gdk_display_manager_get (void) * gdk_display_manager_get_default_display: * @display_manager: a #GdkDisplayManager * - * Gets the default #GdkDisplay. - * - * Returns: a #GdkDisplay, or %NULL if there is no default + * Gets the default #GdkDisplay. + * + * Returns: (transfer none): a #GdkDisplay, or %NULL if there is no default * display. * * Since: 2.2 @@ -190,8 +191,8 @@ gdk_display_manager_get_default_display (GdkDisplayManager *display_manager) * Gets the default #GdkDisplay. This is a convenience * function for * <literal>gdk_display_manager_get_default_display (gdk_display_manager_get ())</literal>. - * - * Returns: a #GdkDisplay, or %NULL if there is no default + * + * Returns: (transfer none): a #GdkDisplay, or %NULL if there is no default * display. * * Since: 2.2 @@ -207,8 +208,8 @@ gdk_display_get_default (void) * * Gets the default screen for the default display. (See * gdk_display_get_default ()). - * - * Returns: a #GdkScreen, or %NULL if there is no default display. + * + * Returns: (transfer none): a #GdkScreen, or %NULL if there is no default display. * * Since: 2.2 */ |