gdk: Use const instead G_CONST_RETURN

This commit is contained in:
Javier Jardón
2011-06-06 19:05:18 +01:00
parent 7a328b377c
commit 7c688cb8a6
14 changed files with 19 additions and 19 deletions

View File

@ -1502,7 +1502,7 @@ gdk_internal_connection_watch (Display *display,
}
#endif /* HAVE_X11R6 */
static G_CONST_RETURN gchar *
static const gchar *
gdk_x11_display_get_name (GdkDisplay *display)
{
return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
@ -2188,7 +2188,7 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display)
*
* Since: 2.12
*/
G_CONST_RETURN gchar *
const gchar *
gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
{
return GDK_X11_DISPLAY (display)->startup_notification_id;

View File

@ -503,7 +503,7 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name)
*
* Since: 2.2
**/
G_CONST_RETURN gchar *
const gchar *
gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom)
{
@ -525,7 +525,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
* Return value: name of the X atom; this string is owned by GTK+,
* so it shouldn't be modifed or freed.
**/
G_CONST_RETURN gchar *
const gchar *
gdk_x11_get_xatom_name (Atom xatom)
{
return get_atom_name (gdk_x11_xatom_to_atom (xatom));

View File

@ -60,7 +60,7 @@ Display *gdk_x11_display_get_xdisplay (GdkDisplay *display);
guint32 gdk_x11_display_get_user_time (GdkDisplay *display);
G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
const gchar * gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
void gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
const gchar *startup_id);

View File

@ -45,13 +45,13 @@ GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
Atom xatom);
Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
const gchar *atom_name);
G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom);
#ifndef GDK_MULTIHEAD_SAFE
Atom gdk_x11_atom_to_xatom (GdkAtom atom);
GdkAtom gdk_x11_xatom_to_atom (Atom xatom);
Atom gdk_x11_get_xatom_by_name (const gchar *atom_name);
G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom);
const gchar * gdk_x11_get_xatom_name (Atom xatom);
#endif
G_END_DECLS