From d35e4848a2cca769847fdf7bfb5d0a93551a5a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 24 Jun 2010 18:10:03 +0200
Subject: [PATCH] [docs] Fix annotations: "(allow-none): (out)" -> "(out)
 (allow-none)"

---
 gdk/gdkdisplay.c |  6 +++---
 gdk/gdkdraw.c    |  4 ++--
 gtk/gtktable.c   |  4 ++--
 gtk/gtkwidget.c  |  4 ++--
 gtk/gtkwindow.c  | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 366fcfd326..0b91f88b97 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -820,9 +820,9 @@ gdk_display_set_device_hooks (GdkDisplay                  *display,
  * @display: a #GdkDisplay
  * @screen: (allow-none): location to store the screen that the
  *          cursor is on, or %NULL.
- * @x: (allow-none): (out): location to store root window X coordinate of pointer, or %NULL.
- * @y: (allow-none): (out): location to store root window Y coordinate of pointer, or %NULL.
- * @mask: (allow-none): (out): location to store current modifier mask, or %NULL
+ * @x: (out) (allow-none): location to store root window X coordinate of pointer, or %NULL.
+ * @y: (out) (allow-none): location to store root window Y coordinate of pointer, or %NULL.
+ * @mask: (out) (allow-none): location to store current modifier mask, or %NULL
  *
  * Gets the current location of the pointer and the current modifier
  * mask for a given display.
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 65412cc0f1..d2a3317a93 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -97,8 +97,8 @@ gdk_drawable_init (GdkDrawable *drawable)
 /**
  * gdk_drawable_get_size:
  * @drawable: a #GdkDrawable
- * @width: (allow-none): (out): location to store drawable's width, or %NULL
- * @height: (allow-none): (out): location to store drawable's height, or %NULL
+ * @width: (out) (allow-none): location to store drawable's width, or %NULL
+ * @height: (out) (allow-none): location to store drawable's height, or %NULL
  *
  * Fills *@width and *@height with the size of @drawable.
  * @width or @height can be %NULL if you only want the other one.
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 79efc26dee..22a283836d 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -799,9 +799,9 @@ gtk_table_get_homogeneous (GtkTable *table)
 /**
  * gtk_table_get_size:
  * @table: a #GtkTable
- * @rows: (allow-none): (out): return location for the number of
+ * @rows: (out) (allow-none): return location for the number of
  *   rows, or %NULL
- * @columns: (allow-none): (out): return location for the number
+ * @columns: (out) (allow-none): return location for the number
  *   of columns, or %NULL
  *
  * Returns the number of rows and columns in the table.
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ae3de17791..610660eb4d 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -7939,8 +7939,8 @@ gtk_widget_set_size_request (GtkWidget *widget,
 /**
  * gtk_widget_get_size_request:
  * @widget: a #GtkWidget
- * @width: (allow-none): (out): return location for width, or %NULL
- * @height: (allow-none): (out): return location for height, or %NULL
+ * @width: (out) (allow-none): return location for width, or %NULL
+ * @height: (out) (allow-none): return location for height, or %NULL
  *
  * Gets the size request that was explicitly set for the widget using
  * gtk_widget_set_size_request(). A value of -1 stored in @width or
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 874f08b038..2866774e64 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4066,8 +4066,8 @@ gtk_window_resize (GtkWindow *window,
 /**
  * gtk_window_get_size:
  * @window: a #GtkWindow
- * @width: (allow-none): (out): return location for width, or %NULL
- * @height: (allow-none): (out): return location for height, or %NULL
+ * @width: (out) (allow-none): return location for width, or %NULL
+ * @height: (out) (allow-none): return location for height, or %NULL
  *
  * Obtains the current size of @window. If @window is not onscreen,
  * it returns the size GTK+ will suggest to the <link
@@ -7465,10 +7465,10 @@ gtk_window_begin_resize_drag  (GtkWindow    *window,
 /**
  * gtk_window_get_frame_dimensions:
  * @window: a #GtkWindow
- * @left: (allow-none) (out): location to store the width of the frame at the left, or %NULL
- * @top: (allow-none) (out): location to store the height of the frame at the top, or %NULL
- * @right: (allow-none) (out): location to store the width of the frame at the returns, or %NULL
- * @bottom: (allow-none) (out): location to store the height of the frame at the bottom, or %NULL
+ * @left: (out) (allow-none): location to store the width of the frame at the left, or %NULL
+ * @top: (out) (allow-none): location to store the height of the frame at the top, or %NULL
+ * @right: (out) (allow-none): location to store the width of the frame at the returns, or %NULL
+ * @bottom: (out) (allow-none): location to store the height of the frame at the bottom, or %NULL
  *
  * (Note: this is a special-purpose function intended for the
  *  framebuffer port; see gtk_window_set_has_frame(). It will not