summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2014-01-09 21:47:04 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2014-01-09 21:47:04 +0100
commited5d9b3c3e7ce5d848cfed8357c25f0a43c53193 (patch)
tree123975565129be33ffac4d5fdb2cd0f5f96a77e1
parent7291d3e7801a8ebe4e720a5f3e5a4fe931abbb5b (diff)
downloadgtk+-ed5d9b3c3e7ce5d848cfed8357c25f0a43c53193.tar.gz
x11: Add/Fix '(type *)' g-i annotations
-rw-r--r--gdk/x11/gdkdevicemanager-x11.c6
-rw-r--r--gdk/x11/gdkdisplay-x11.c4
-rw-r--r--gdk/x11/gdkkeys-x11.c4
-rw-r--r--gdk/x11/gdkproperty-x11.c8
-rw-r--r--gdk/x11/gdkscreen-x11.c4
-rw-r--r--gdk/x11/gdkvisual-x11.c4
-rw-r--r--gdk/x11/gdkwindow-x11.c6
-rw-r--r--gdk/x11/gdkxid.c4
8 files changed, 20 insertions, 20 deletions
diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index fc995f9989..61a958930b 100644
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -79,12 +79,12 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
/**
* gdk_x11_device_manager_lookup:
- * @device_manager: a #GdkDeviceManager
+ * @device_manager: (type GdkX11DeviceManagerCore): a #GdkDeviceManager
* @device_id: a device ID, as understood by the XInput2 protocol
*
* Returns the #GdkDevice that wraps the given device ID.
*
- * Returns: (transfer none): (allow-none): The #GdkDevice wrapping the device ID,
+ * Returns: (transfer none) (allow-none) (type GdkX11DeviceCore): The #GdkDevice wrapping the device ID,
* or %NULL if the given ID doesn't currently represent a device.
*
* Since: 3.2
@@ -120,7 +120,7 @@ gdk_x11_device_manager_lookup (GdkDeviceManager *device_manager,
/**
* gdk_x11_device_get_id:
- * @device: a #GdkDevice
+ * @device: (type GdkX11DeviceCore): a #GdkDevice
*
* Returns the device ID as seen by XInput2.
*
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 347bcce6bd..a065d5ba8c 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1949,7 +1949,7 @@ gdk_x11_display_finalize (GObject *object)
*
* Find the #GdkDisplay corresponding to @display, if any exists.
*
- * Return value: (transfer none): the #GdkDisplay, if found, otherwise %NULL.
+ * Return value: (transfer none) (type GdkX11Display): the #GdkDisplay, if found, otherwise %NULL.
*
* Since: 2.2
**/
@@ -2436,7 +2436,7 @@ gdk_x11_display_list_devices (GdkDisplay *display)
/**
* gdk_x11_register_standard_event_type:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
* @event_base: first event type code to register
* @n_events: number of event type codes to register
*
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 1314275166..2af3898f08 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1352,7 +1352,7 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap *keymap,
/**
* gdk_x11_keymap_get_group_for_state:
- * @keymap: a #GdkX11Keymap
+ * @keymap: (type GdkX11Keymap): a #GdkX11Keymap
* @state: raw state returned from X
*
* Extracts the group from the state field sent in an X Key event.
@@ -1440,7 +1440,7 @@ gdk_x11_keymap_add_virtual_modifiers (GdkKeymap *keymap,
/**
* gdk_x11_keymap_key_is_modifier:
- * @keymap: a #GdkX11Keymap
+ * @keymap: (type GdkX11Keymap): a #GdkX11Keymap
* @keycode: the hardware keycode from a key event
*
* Determines whether a particular key code represents a key that
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 362242489b..4deb90fc49 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -168,7 +168,7 @@ lookup_cached_xatom (GdkDisplay *display,
/**
* gdk_x11_atom_to_xatom_for_display:
- * @display: A #GdkDisplay
+ * @display: (type GdkX11Display): A #GdkDisplay
* @atom: A #GdkAtom, or %GDK_NONE
*
* Converts from a #GdkAtom to the X atom for a #GdkDisplay
@@ -264,7 +264,7 @@ gdk_x11_atom_to_xatom (GdkAtom atom)
/**
* gdk_x11_xatom_to_atom_for_display:
- * @display: A #GdkDisplay
+ * @display: (type GdkX11Display): A #GdkDisplay
* @xatom: an X atom
*
* Convert from an X atom for a #GdkDisplay to the corresponding
@@ -339,7 +339,7 @@ gdk_x11_xatom_to_atom (Atom xatom)
/**
* gdk_x11_get_xatom_by_name_for_display:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
* @atom_name: a string
*
* Returns the X atom for a #GdkDisplay corresponding to @atom_name.
@@ -398,7 +398,7 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name)
/**
* gdk_x11_get_xatom_name_for_display:
- * @display: the #GdkDisplay where @xatom is defined
+ * @display: (type GdkX11Display): the #GdkDisplay where @xatom is defined
* @xatom: an X atom
*
* Returns the name of an X atom for its display. This
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 31e5688ab8..8fee444c82 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1789,7 +1789,7 @@ get_netwm_cardinal_property (GdkScreen *screen,
/**
* gdk_x11_screen_get_number_of_desktops:
- * @screen: a #GdkScreen
+ * @screen: (type GdkX11Screen): a #GdkScreen
*
* Returns the number of workspaces for @screen when running under a
* window manager that supports multiple workspaces, as described
@@ -1808,7 +1808,7 @@ gdk_x11_screen_get_number_of_desktops (GdkScreen *screen)
/**
* gdk_x11_screen_get_current_desktop:
- * @screen: a #GdkScreen
+ * @screen: (type GdkX11Screen): a #GdkScreen
*
* Returns the current workspace for @screen when running under a
* window manager that supports multiple workspaces, as described
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 9901051351..752beb6bf8 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -476,7 +476,7 @@ _gdk_x11_screen_list_visuals (GdkScreen *screen)
*
* Looks up the #GdkVisual for a particular screen and X Visual ID.
*
- * Returns: (transfer none): the #GdkVisual (owned by the screen
+ * Returns: (transfer none) (type GdkX11Visual): the #GdkVisual (owned by the screen
* object), or %NULL if the visual ID wasn't found.
*
* Since: 2.2
@@ -579,7 +579,7 @@ _gdk_visual_get_x11_colormap (GdkVisual *visual)
/**
* gdk_x11_visual_get_xvisual:
- * @visual: a #GdkVisual.
+ * @visual: (type GdkX11Visual): a #GdkVisual.
*
* Returns the X visual belonging to a #GdkVisual.
*
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 63ecf14173..186b8dfdb5 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1172,7 +1172,7 @@ x_event_mask_to_gdk_event_mask (long mask)
/**
* gdk_x11_window_foreign_new_for_display:
- * @display: the #GdkDisplay where the window handle comes from.
+ * @display: (type GdkX11Display): the #GdkDisplay where the window handle comes from.
* @window: an XLib <type>Window</type>
*
* Wraps a native window in a #GdkWindow. The function will try to
@@ -2168,7 +2168,7 @@ get_netwm_cardinal_property (GdkWindow *window,
/**
* gdk_x11_window_get_desktop:
- * @window: a #GdkWindow
+ * @window: (type GdkX11Window): a #GdkWindow
*
* Gets the number of the workspace @window is on.
*
@@ -2186,7 +2186,7 @@ gdk_x11_window_get_desktop (GdkWindow *window)
/**
* gdk_x11_window_move_to_desktop:
- * @window: a #GdkWindow
+ * @window: (type GdkX11Window): a #GdkWindow
* @desktop: the number of the workspace to move the window to
*
* Moves the window to the given workspace when running unde a
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 5eaa36af1e..448230275c 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -79,13 +79,13 @@ _gdk_x11_display_remove_window (GdkDisplay *display,
/**
* gdk_x11_window_lookup_for_display:
- * @display: (type GdkX11Window): the #GdkDisplay corresponding to the
+ * @display: (type GdkX11Display): the #GdkDisplay corresponding to the
* window handle
* @window: an XLib <type>Window</type>
*
* Looks up the #GdkWindow that wraps the given native window handle.
*
- * Return value: (transfer none): the #GdkWindow wrapper for the native
+ * Return value: (transfer none) (type GdkX11Window): the #GdkWindow wrapper for the native
* window, or %NULL if there is none.
*
* Since: 2.24