| 1 |
pacho 11/09/26 12:21:02 |
| 2 |
|
| 3 |
Added: gtk+-3.0.12-use-const.patch |
| 4 |
Log: |
| 5 |
Use const instead G_CONST_RETURN, bug #379897 by Alexandre Rostovtsev. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/gtk+/files/gtk+-3.0.12-use-const.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.0.12-use-const.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.0.12-use-const.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gtk+-3.0.12-use-const.patch |
| 16 |
=================================================================== |
| 17 |
From 6c3d5c45bcd78b54c3641d6748f9e0e80c1fba46 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@×××××.org> |
| 19 |
Date: Mon, 6 Jun 2011 19:05:18 +0100 |
| 20 |
Subject: [PATCH 1/2] gdk: Use const instead G_CONST_RETURN |
| 21 |
|
| 22 |
[Alexandre Rostovtsev <tetromino@×××××.com>: backport to 3.0.12] |
| 23 |
--- |
| 24 |
gdk/gdk.c | 4 ++-- |
| 25 |
gdk/gdkdevice.h | 2 +- |
| 26 |
gdk/gdkdisplay.c | 2 +- |
| 27 |
gdk/gdkdisplay.h | 2 +- |
| 28 |
gdk/gdkdisplayprivate.h | 2 +- |
| 29 |
gdk/gdkmain.h | 4 ++-- |
| 30 |
gdk/win32/gdkdisplay-win32.c | 2 +- |
| 31 |
gdk/x11/gdkdisplay-x11.c | 4 ++-- |
| 32 |
gdk/x11/gdkproperty-x11.c | 4 ++-- |
| 33 |
gdk/x11/gdkx11display.h | 2 +- |
| 34 |
gdk/x11/gdkx11property.h | 4 ++-- |
| 35 |
11 files changed, 16 insertions(+), 16 deletions(-) |
| 36 |
|
| 37 |
diff --git a/gdk/gdk.c b/gdk/gdk.c |
| 38 |
index 43d45f5..241683a 100644 |
| 39 |
--- a/gdk/gdk.c |
| 40 |
+++ b/gdk/gdk.c |
| 41 |
@@ -306,7 +306,7 @@ gdk_parse_args (int *argc, |
| 42 |
* |
| 43 |
* Since: 2.2 |
| 44 |
*/ |
| 45 |
-G_CONST_RETURN gchar * |
| 46 |
+const gchar * |
| 47 |
gdk_get_display_arg_name (void) |
| 48 |
{ |
| 49 |
if (!_gdk_display_arg_name) |
| 50 |
@@ -1039,7 +1039,7 @@ gdk_threads_add_timeout_seconds (guint interval, |
| 51 |
* |
| 52 |
* Returns: the program class. |
| 53 |
*/ |
| 54 |
-G_CONST_RETURN char * |
| 55 |
+const char * |
| 56 |
gdk_get_program_class (void) |
| 57 |
{ |
| 58 |
return gdk_progclass; |
| 59 |
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h |
| 60 |
index a6ceac0..9109d65 100644 |
| 61 |
--- a/gdk/gdkdevice.h |
| 62 |
+++ b/gdk/gdkdevice.h |
| 63 |
@@ -156,7 +156,7 @@ struct _GdkTimeCoord |
| 64 |
|
| 65 |
GType gdk_device_get_type (void) G_GNUC_CONST; |
| 66 |
|
| 67 |
-G_CONST_RETURN gchar *gdk_device_get_name (GdkDevice *device); |
| 68 |
+const gchar * gdk_device_get_name (GdkDevice *device); |
| 69 |
gboolean gdk_device_get_has_cursor (GdkDevice *device); |
| 70 |
|
| 71 |
/* Functions to configure a device */ |
| 72 |
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c |
| 73 |
index 1b8c7e7..f4095c2 100644 |
| 74 |
--- a/gdk/gdkdisplay.c |
| 75 |
+++ b/gdk/gdkdisplay.c |
| 76 |
@@ -1336,7 +1336,7 @@ gdk_display_get_device_manager (GdkDisplay *display) |
| 77 |
* |
| 78 |
* Since: 2.2 |
| 79 |
*/ |
| 80 |
-G_CONST_RETURN gchar * |
| 81 |
+const gchar * |
| 82 |
gdk_display_get_name (GdkDisplay *display) |
| 83 |
{ |
| 84 |
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); |
| 85 |
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h |
| 86 |
index 65daad1..3c4179e 100644 |
| 87 |
--- a/gdk/gdkdisplay.h |
| 88 |
+++ b/gdk/gdkdisplay.h |
| 89 |
@@ -44,7 +44,7 @@ G_BEGIN_DECLS |
| 90 |
GType gdk_display_get_type (void) G_GNUC_CONST; |
| 91 |
GdkDisplay *gdk_display_open (const gchar *display_name); |
| 92 |
|
| 93 |
-G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display); |
| 94 |
+const gchar * gdk_display_get_name (GdkDisplay *display); |
| 95 |
|
| 96 |
gint gdk_display_get_n_screens (GdkDisplay *display); |
| 97 |
GdkScreen * gdk_display_get_screen (GdkDisplay *display, |
| 98 |
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h |
| 99 |
index 1126d96..2d48943 100644 |
| 100 |
--- a/gdk/gdkdisplayprivate.h |
| 101 |
+++ b/gdk/gdkdisplayprivate.h |
| 102 |
@@ -120,7 +120,7 @@ struct _GdkDisplayClass |
| 103 |
|
| 104 |
GType window_type; /* type for native windows for this display, set in class_init */ |
| 105 |
|
| 106 |
- G_CONST_RETURN gchar * (*get_name) (GdkDisplay *display); |
| 107 |
+ const gchar * (*get_name) (GdkDisplay *display); |
| 108 |
gint (*get_n_screens) (GdkDisplay *display); |
| 109 |
GdkScreen * (*get_screen) (GdkDisplay *display, |
| 110 |
gint screen_num); |
| 111 |
diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h |
| 112 |
index bcbe4d0..411b58f 100644 |
| 113 |
--- a/gdk/gdkmain.h |
| 114 |
+++ b/gdk/gdkmain.h |
| 115 |
@@ -50,7 +50,7 @@ gboolean gdk_init_check (gint *argc, |
| 116 |
void gdk_add_option_entries_libgtk_only (GOptionGroup *group); |
| 117 |
void gdk_pre_parse_libgtk_only (void); |
| 118 |
|
| 119 |
-G_CONST_RETURN gchar *gdk_get_program_class (void); |
| 120 |
+const gchar * gdk_get_program_class (void); |
| 121 |
void gdk_set_program_class (const gchar *program_class); |
| 122 |
|
| 123 |
void gdk_notify_startup_complete (void); |
| 124 |
@@ -64,7 +64,7 @@ G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop (void); |
| 125 |
void gdk_error_trap_pop_ignored (void); |
| 126 |
|
| 127 |
|
| 128 |
-G_CONST_RETURN gchar *gdk_get_display_arg_name (void); |
| 129 |
+const gchar * gdk_get_display_arg_name (void); |
| 130 |
|
| 131 |
/** |
| 132 |
* gdk_get_display: |
| 133 |
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c |
| 134 |
index 1faa4cf..8e7c988 100644 |
| 135 |
--- a/gdk/win32/gdkdisplay-win32.c |
| 136 |
+++ b/gdk/win32/gdkdisplay-win32.c |
| 137 |
@@ -236,7 +236,7 @@ struct _GdkWin32DisplayClass |
| 138 |
|
| 139 |
G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY) |
| 140 |
|
| 141 |
-static G_CONST_RETURN gchar * |
| 142 |
+static const gchar * |
| 143 |
gdk_win32_display_get_name (GdkDisplay *display) |
| 144 |
{ |
| 145 |
HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ()); |
| 146 |
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c |
| 147 |
index 2911a3a..983ac72 100644 |
| 148 |
--- a/gdk/x11/gdkdisplay-x11.c |
| 149 |
+++ b/gdk/x11/gdkdisplay-x11.c |
| 150 |
@@ -1502,7 +1502,7 @@ gdk_internal_connection_watch (Display *display, |
| 151 |
} |
| 152 |
#endif /* HAVE_X11R6 */ |
| 153 |
|
| 154 |
-static G_CONST_RETURN gchar * |
| 155 |
+static const gchar * |
| 156 |
gdk_x11_display_get_name (GdkDisplay *display) |
| 157 |
{ |
| 158 |
return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay); |
| 159 |
@@ -2185,7 +2185,7 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display) |
| 160 |
* |
| 161 |
* Since: 2.12 |
| 162 |
*/ |
| 163 |
-G_CONST_RETURN gchar * |
| 164 |
+const gchar * |
| 165 |
gdk_x11_display_get_startup_notification_id (GdkDisplay *display) |
| 166 |
{ |
| 167 |
return GDK_X11_DISPLAY (display)->startup_notification_id; |
| 168 |
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c |
| 169 |
index 0cf753c..678b196 100644 |
| 170 |
--- a/gdk/x11/gdkproperty-x11.c |
| 171 |
+++ b/gdk/x11/gdkproperty-x11.c |
| 172 |
@@ -503,7 +503,7 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name) |
| 173 |
* |
| 174 |
* Since: 2.2 |
| 175 |
**/ |
| 176 |
-G_CONST_RETURN gchar * |
| 177 |
+const gchar * |
| 178 |
gdk_x11_get_xatom_name_for_display (GdkDisplay *display, |
| 179 |
Atom xatom) |
| 180 |
{ |
| 181 |
@@ -525,7 +525,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display, |
| 182 |
* Return value: name of the X atom; this string is owned by GTK+, |
| 183 |
* so it shouldn't be modifed or freed. |
| 184 |
**/ |
| 185 |
-G_CONST_RETURN gchar * |
| 186 |
+const gchar * |
| 187 |
gdk_x11_get_xatom_name (Atom xatom) |
| 188 |
{ |
| 189 |
return get_atom_name (gdk_x11_xatom_to_atom (xatom)); |
| 190 |
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h |
| 191 |
index b544ac4..8781edb 100644 |
| 192 |
--- a/gdk/x11/gdkx11display.h |
| 193 |
+++ b/gdk/x11/gdkx11display.h |
| 194 |
@@ -60,7 +60,7 @@ Display *gdk_x11_display_get_xdisplay (GdkDisplay *display); |
| 195 |
|
| 196 |
guint32 gdk_x11_display_get_user_time (GdkDisplay *display); |
| 197 |
|
| 198 |
-G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display); |
| 199 |
+const gchar * gdk_x11_display_get_startup_notification_id (GdkDisplay *display); |
| 200 |
void gdk_x11_display_set_startup_notification_id (GdkDisplay *display, |
| 201 |
const gchar *startup_id); |
| 202 |
|
| 203 |
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h |
| 204 |
index 64fb978..9227063 100644 |
| 205 |
--- a/gdk/x11/gdkx11property.h |
| 206 |
+++ b/gdk/x11/gdkx11property.h |
| 207 |
@@ -45,13 +45,13 @@ GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display, |
| 208 |
Atom xatom); |
| 209 |
Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display, |
| 210 |
const gchar *atom_name); |
| 211 |
-G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay *display, |
| 212 |
+const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display, |
| 213 |
Atom xatom); |
| 214 |
#ifndef GDK_MULTIHEAD_SAFE |
| 215 |
Atom gdk_x11_atom_to_xatom (GdkAtom atom); |
| 216 |
GdkAtom gdk_x11_xatom_to_atom (Atom xatom); |
| 217 |
Atom gdk_x11_get_xatom_by_name (const gchar *atom_name); |
| 218 |
-G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom); |
| 219 |
+const gchar * gdk_x11_get_xatom_name (Atom xatom); |
| 220 |
#endif |
| 221 |
|
| 222 |
G_END_DECLS |
| 223 |
-- |
| 224 |
1.7.6 |
Archives