Attachment #283965 for bug #379897

Lines 306-312 gdk_parse_args (int *argc, Link Here

(-)a/gdk/gdk.c (-2 / +2 lines)
306	*	306	*
307	* Since: 2.2	307	* Since: 2.2
308	*/	308	*/
309	G_CONST_RETURN gchar *	309	const gchar *
310	gdk_get_display_arg_name (void)	310	gdk_get_display_arg_name (void)
311	{	311	{
312	if (!_gdk_display_arg_name)	312	if (!_gdk_display_arg_name)
Lines 1039-1045 gdk_threads_add_timeout_seconds (guint interval, Link Here
1039	*	1039	*
1040	* Returns: the program class.	1040	* Returns: the program class.
1041	*/	1041	*/
1042	G_CONST_RETURN char *	1042	const char *
1043	gdk_get_program_class (void)	1043	gdk_get_program_class (void)
1044	{	1044	{
1045	return gdk_progclass;	1045	return gdk_progclass;

Lines 156-162 struct _GdkTimeCoord Link Here

(-)a/gdk/gdkdevice.h (-1 / +1 lines)
156		156
157	GType gdk_device_get_type (void) G_GNUC_CONST;	157	GType gdk_device_get_type (void) G_GNUC_CONST;
158		158
159	G_CONST_RETURN gchar gdk_device_get_name (GdkDevice device);	159	const gchar * gdk_device_get_name (GdkDevice *device);
160	gboolean gdk_device_get_has_cursor (GdkDevice *device);	160	gboolean gdk_device_get_has_cursor (GdkDevice *device);
161		161
162	/* Functions to configure a device */	162	/* Functions to configure a device */

Lines 1336-1342 gdk_display_get_device_manager (GdkDisplay *display) Link Here

(-)a/gdk/gdkdisplay.c (-1 / +1 lines)
1336	*	1336	*
1337	* Since: 2.2	1337	* Since: 2.2
1338	*/	1338	*/
1339	G_CONST_RETURN gchar *	1339	const gchar *
1340	gdk_display_get_name (GdkDisplay *display)	1340	gdk_display_get_name (GdkDisplay *display)
1341	{	1341	{
1342	g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);	1342	g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);

Lines 44-50 G_BEGIN_DECLS Link Here

(-)a/gdk/gdkdisplay.h (-1 / +1 lines)
44	GType gdk_display_get_type (void) G_GNUC_CONST;	44	GType gdk_display_get_type (void) G_GNUC_CONST;
45	GdkDisplay gdk_display_open (const gchar display_name);	45	GdkDisplay gdk_display_open (const gchar display_name);
46		46
47	G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);	47	const gchar * gdk_display_get_name (GdkDisplay *display);
48		48
49	gint gdk_display_get_n_screens (GdkDisplay *display);	49	gint gdk_display_get_n_screens (GdkDisplay *display);
50	GdkScreen * gdk_display_get_screen (GdkDisplay *display,	50	GdkScreen * gdk_display_get_screen (GdkDisplay *display,

Lines 120-126 struct _GdkDisplayClass Link Here

(-)a/gdk/gdkdisplayprivate.h (-1 / +1 lines)
120		120
121	GType window_type; /* type for native windows for this display, set in class_init */	121	GType window_type; /* type for native windows for this display, set in class_init */
122		122
123	G_CONST_RETURN gchar * (get_name) (GdkDisplay display);	123	const gchar * (get_name) (GdkDisplay display);
124	gint (get_n_screens) (GdkDisplay display);	124	gint (get_n_screens) (GdkDisplay display);
125	GdkScreen * (get_screen) (GdkDisplay display,	125	GdkScreen * (get_screen) (GdkDisplay display,
126	gint screen_num);	126	gint screen_num);

Lines 50-56 gboolean gdk_init_check (gint *argc, Link Here

(-)a/gdk/gdkmain.h (-2 / +2 lines)
50	void gdk_add_option_entries_libgtk_only (GOptionGroup *group);	50	void gdk_add_option_entries_libgtk_only (GOptionGroup *group);
51	void gdk_pre_parse_libgtk_only (void);	51	void gdk_pre_parse_libgtk_only (void);
52		52
53	G_CONST_RETURN gchar *gdk_get_program_class (void);	53	const gchar * gdk_get_program_class (void);
54	void gdk_set_program_class (const gchar *program_class);	54	void gdk_set_program_class (const gchar *program_class);
55		55
56	void gdk_notify_startup_complete (void);	56	void gdk_notify_startup_complete (void);
Lines 64-70 G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop (void); Link Here
64	void gdk_error_trap_pop_ignored (void);	64	void gdk_error_trap_pop_ignored (void);
65		65
66		66
67	G_CONST_RETURN gchar *gdk_get_display_arg_name (void);	67	const gchar * gdk_get_display_arg_name (void);
68		68
69	/**	69	/**
70	* gdk_get_display:	70	* gdk_get_display:

Lines 236-242 struct _GdkWin32DisplayClass Link Here

(-)a/gdk/win32/gdkdisplay-win32.c (-1 / +1 lines)
236		236
237	G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)	237	G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
238		238
239	static G_CONST_RETURN gchar *	239	static const gchar *
240	gdk_win32_display_get_name (GdkDisplay *display)	240	gdk_win32_display_get_name (GdkDisplay *display)
241	{	241	{
242	HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());	242	HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());

Lines 1502-1508 gdk_internal_connection_watch (Display *display, Link Here

(-)a/gdk/x11/gdkdisplay-x11.c (-2 / +2 lines)
1502	}	1502	}
1503	#endif /* HAVE_X11R6 */	1503	#endif /* HAVE_X11R6 */
1504		1504
1505	static G_CONST_RETURN gchar *	1505	static const gchar *
1506	gdk_x11_display_get_name (GdkDisplay *display)	1506	gdk_x11_display_get_name (GdkDisplay *display)
1507	{	1507	{
1508	return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);	1508	return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
Lines 2185-2191 gdk_x11_display_supports_input_shapes (GdkDisplay *display) Link Here
2185	*	2185	*
2186	* Since: 2.12	2186	* Since: 2.12
2187	*/	2187	*/
2188	G_CONST_RETURN gchar *	2188	const gchar *
2189	gdk_x11_display_get_startup_notification_id (GdkDisplay *display)	2189	gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
2190	{	2190	{
2191	return GDK_X11_DISPLAY (display)->startup_notification_id;	2191	return GDK_X11_DISPLAY (display)->startup_notification_id;

Lines 503-509 gdk_x11_get_xatom_by_name (const gchar *atom_name) Link Here

(-)a/gdk/x11/gdkproperty-x11.c (-2 / +2 lines)
503	*	503	*
504	* Since: 2.2	504	* Since: 2.2
505	**/	505	**/
506	G_CONST_RETURN gchar *	506	const gchar *
507	gdk_x11_get_xatom_name_for_display (GdkDisplay *display,	507	gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
508	Atom xatom)	508	Atom xatom)
509	{	509	{
Lines 525-531 gdk_x11_get_xatom_name_for_display (GdkDisplay *display, Link Here
525	* Return value: name of the X atom; this string is owned by GTK+,	525	* Return value: name of the X atom; this string is owned by GTK+,
526	* so it shouldn't be modifed or freed.	526	* so it shouldn't be modifed or freed.
527	**/	527	**/
528	G_CONST_RETURN gchar *	528	const gchar *
529	gdk_x11_get_xatom_name (Atom xatom)	529	gdk_x11_get_xatom_name (Atom xatom)
530	{	530	{
531	return get_atom_name (gdk_x11_xatom_to_atom (xatom));	531	return get_atom_name (gdk_x11_xatom_to_atom (xatom));

Lines 60-66 Display gdk_x11_display_get_xdisplay (GdkDisplay display); Link Here

(-)a/gdk/x11/gdkx11display.h (-1 / +1 lines)
60		60
61	guint32 gdk_x11_display_get_user_time (GdkDisplay *display);	61	guint32 gdk_x11_display_get_user_time (GdkDisplay *display);
62		62
63	G_CONST_RETURN gchar gdk_x11_display_get_startup_notification_id (GdkDisplay display);	63	const gchar * gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
64	void gdk_x11_display_set_startup_notification_id (GdkDisplay *display,	64	void gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
65	const gchar *startup_id);	65	const gchar *startup_id);
66		66




                                                         Atom         xatom);
Atom                  gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
                                                             const gchar *atom_name);
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);
const gchar *         gdk_x11_get_xatom_name    (Atom         xatom);
#endif

G_END_DECLS
- 

Return to bug 379897

Lines 45-57 GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display, Link Here

(-)a/gdk/x11/gdkx11property.h (-3 / +2 lines)
45	Atom xatom);	45	Atom xatom);
46	Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,	46	Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
47	const gchar *atom_name);	47	const gchar *atom_name);
48	G_CONST_RETURN gchar gdk_x11_get_xatom_name_for_display (GdkDisplay display,	48	const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
49	Atom xatom);	49	Atom xatom);
50	#ifndef GDK_MULTIHEAD_SAFE	50	#ifndef GDK_MULTIHEAD_SAFE
51	Atom gdk_x11_atom_to_xatom (GdkAtom atom);	51	Atom gdk_x11_atom_to_xatom (GdkAtom atom);
52	GdkAtom gdk_x11_xatom_to_atom (Atom xatom);	52	GdkAtom gdk_x11_xatom_to_atom (Atom xatom);
53	Atom gdk_x11_get_xatom_by_name (const gchar *atom_name);	53	Atom gdk_x11_get_xatom_by_name (const gchar *atom_name);
54	G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom);	54	const gchar * gdk_x11_get_xatom_name (Atom xatom);
55	#endif	55	#endif
56		56
57	G_END_DECLS	57	G_END_DECLS
58	-