Permalink
Browse files

Enable introspection of X11-specific functions and methods

Functions dealing with native Xlib types were (skip)ed because
gobject-introspection did not have correct Xlib types declarations.
They are corrected now, so these GdkX11 functions can be enabled back
again.

https://bugzilla.gnome.org/show_bug.cgi?id=655495
  • Loading branch information...
1 parent dca9db1 commit 0893a3fd390d7d1fb40a0d2939852618e40c0289 Pavel Holejsovsky committed Jul 28, 2011
View
@@ -285,12 +285,12 @@ _gdk_x11_display_get_cursor_for_type (GdkDisplay *display,
}
/**
- * gdk_x11_cursor_get_xdisplay: (skip)
+ * gdk_x11_cursor_get_xdisplay:
* @cursor: a #GdkCursor.
*
* Returns the display of a #GdkCursor.
*
- * Return value: an Xlib <type>Display*</type>.
+ * Return value: (transfer none): an Xlib <type>Display*</type>.
**/
Display *
gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
@@ -301,7 +301,7 @@ gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
}
/**
- * gdk_x11_cursor_get_xcursor: (skip)
+ * gdk_x11_cursor_get_xcursor:
* @cursor: a #GdkCursor.
*
* Returns the X cursor belonging to a #GdkCursor.
View
@@ -1843,9 +1843,9 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
}
/**
- * gdk_x11_display_get_xdisplay: (skip)
+ * gdk_x11_display_get_xdisplay:
* @display: a #GdkDisplay
- * @returns: an X display.
+ * @returns: (transfer none): an X display.
*
* Returns the X display of a #GdkDisplay.
*
View
@@ -442,7 +442,7 @@ gdk_x11_get_default_screen (void)
}
/**
- * gdk_x11_get_default_root_xwindow: (skip)
+ * gdk_x11_get_default_root_xwindow:
*
* Gets the root window of the default screen
* (see gdk_x11_get_default_screen()).
@@ -456,13 +456,13 @@ gdk_x11_get_default_root_xwindow (void)
}
/**
- * gdk_x11_get_default_xdisplay: (skip)
+ * gdk_x11_get_default_xdisplay:
*
* Gets the default GTK+ display.
*
- * Return value: the Xlib <type>Display*</type> for the display
- * specified in the <option>--display</option> command line option
- * or the <envar>DISPLAY</envar> environment variable.
+ * Return value: (transfer none): the Xlib <type>Display*</type> for
+ * the display specified in the <option>--display</option> command
+ * line option or the <envar>DISPLAY</envar> environment variable.
**/
Display *
gdk_x11_get_default_xdisplay (void)
View
@@ -207,7 +207,7 @@ lookup_cached_xatom (GdkDisplay *display,
}
/**
- * gdk_x11_atom_to_xatom_for_display: (skip)
+ * gdk_x11_atom_to_xatom_for_display:
* @display: A #GdkDisplay
* @atom: A #GdkAtom, or %GDK_NONE
*
@@ -298,7 +298,7 @@ _gdk_x11_precache_atoms (GdkDisplay *display,
}
/**
- * gdk_x11_atom_to_xatom: (skip)
+ * gdk_x11_atom_to_xatom:
* @atom: A #GdkAtom
*
* Converts from a #GdkAtom to the X atom for the default GDK display
@@ -313,14 +313,14 @@ gdk_x11_atom_to_xatom (GdkAtom atom)
}
/**
- * gdk_x11_xatom_to_atom_for_display: (skip)
+ * gdk_x11_xatom_to_atom_for_display:
* @display: A #GdkDisplay
* @xatom: an X atom
*
* Convert from an X atom for a #GdkDisplay to the corresponding
* #GdkAtom.
*
- * Return value: the corresponding #GdkAtom.
+ * Return value: (transfer none): the corresponding #GdkAtom.
*
* Since: 2.2
**/
@@ -373,13 +373,13 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
}
/**
- * gdk_x11_xatom_to_atom: (skip)
+ * gdk_x11_xatom_to_atom:
* @xatom: an X atom for the default GDK display
*
* Convert from an X atom for the default display to the corresponding
* #GdkAtom.
*
- * Return value: the corresponding G#dkAtom.
+ * Return value: (transfer none): the corresponding G#dkAtom.
**/
GdkAtom
gdk_x11_xatom_to_atom (Atom xatom)
@@ -450,7 +450,7 @@ _gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
}
/**
- * gdk_x11_get_xatom_by_name_for_display: (skip)
+ * gdk_x11_get_xatom_by_name_for_display:
* @display: a #GdkDisplay
* @atom_name: a string
*
@@ -472,7 +472,7 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
}
/**
- * gdk_x11_get_xatom_by_name: (skip)
+ * gdk_x11_get_xatom_by_name:
* @atom_name: a string
*
* Returns the X atom for GDK's default display corresponding to @atom_name.
View
@@ -265,7 +265,7 @@ gdk_x11_screen_get_monitor_plug_name (GdkScreen *screen,
}
/**
- * gdk_x11_screen_get_monitor_output: (skip)
+ * gdk_x11_screen_get_monitor_output:
* @screen: a #GdkScreen
* @monitor_num: number of the monitor, between 0 and gdk_screen_get_n_monitors (screen)
*
View
@@ -564,12 +564,12 @@ _gdk_visual_get_x11_colormap (GdkVisual *visual)
}
/**
- * gdk_x11_visual_get_xvisual: (skip)
+ * gdk_x11_visual_get_xvisual:
* @visual: a #GdkVisual.
*
* Returns the X visual belonging to a #GdkVisual.
*
- * Return value: an Xlib <type>Visual*</type>.
+ * Return value: (transfer none): an Xlib <type>Visual*</type>.
**/
Visual *
gdk_x11_visual_get_xvisual (GdkVisual *visual)
View
@@ -4738,7 +4738,7 @@ gdk_x11_get_server_time (GdkWindow *window)
}
/**
- * gdk_x11_window_get_xid: (skip)
+ * gdk_x11_window_get_xid:
* @window: a native #GdkWindow.
*
* Returns the X resource (window) belonging to a #GdkWindow.

0 comments on commit 0893a3f

Please sign in to comment.