2 patch -p1 -l -f $* < $0
6 diff -urpb orig/atk-1.32.0/atk/atkaction.c atk/atk/atkaction.c
7 --- orig/atk-1.32.0/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200
8 +++ atk/atk/atkaction.c 2014-02-17 12:30:53.263192763 +0100
9 @@ -101,7 +101,7 @@ atk_action_get_n_actions (AtkAction *ob
10 * Returns a description string, or %NULL
11 * if @action does not implement this interface.
13 -G_CONST_RETURN gchar*
15 atk_action_get_description (AtkAction *obj,
18 @@ -140,7 +140,7 @@ atk_action_get_description (AtkAction *o
19 * Returns a name string, or %NULL
20 * if @action does not implement this interface.
22 -G_CONST_RETURN gchar*
24 atk_action_get_name (AtkAction *obj,
27 @@ -166,7 +166,7 @@ atk_action_get_name (AtkAction *obj,
28 * Returns a name string, or %NULL
29 * if @action does not implement this interface.
31 -G_CONST_RETURN gchar*
33 atk_action_get_localized_name (AtkAction *obj,
36 @@ -203,7 +203,7 @@ atk_action_get_localized_name (AtkAction
37 * if there is no keybinding for this action.
40 -G_CONST_RETURN gchar*
42 atk_action_get_keybinding (AtkAction *obj,
45 Only in atk/atk: atkaction.c~
46 diff -urpb orig/atk-1.32.0/atk/atkaction.h atk/atk/atkaction.h
47 --- orig/atk-1.32.0/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200
48 +++ atk/atk/atkaction.h 2014-02-17 12:30:58.907192071 +0100
49 @@ -55,16 +55,16 @@ struct _AtkActionIface
50 gboolean (*do_action) (AtkAction *action,
52 gint (*get_n_actions) (AtkAction *action);
53 - G_CONST_RETURN gchar* (*get_description) (AtkAction *action,
54 + const gchar* (*get_description) (AtkAction *action,
56 - G_CONST_RETURN gchar* (*get_name) (AtkAction *action,
57 + const gchar* (*get_name) (AtkAction *action,
59 - G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action,
60 + const gchar* (*get_keybinding) (AtkAction *action,
62 gboolean (*set_description) (AtkAction *action,
65 - G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action,
66 + const gchar* (*get_localized_name)(AtkAction *action,
70 @@ -85,11 +85,11 @@ GType atk_action_get_type (void);
71 gboolean atk_action_do_action (AtkAction *action,
73 gint atk_action_get_n_actions (AtkAction *action);
74 -G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
75 +const gchar* atk_action_get_description (AtkAction *action,
77 -G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
78 +const gchar* atk_action_get_name (AtkAction *action,
80 -G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
81 +const gchar* atk_action_get_keybinding (AtkAction *action,
83 gboolean atk_action_set_description (AtkAction *action,
85 @@ -97,7 +97,7 @@ gboolean atk_action_set_des
89 -G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
90 +const gchar* atk_action_get_localized_name (AtkAction *action,
94 Only in atk/atk: atkaction.h~
95 diff -urpb orig/atk-1.32.0/atk/atkdocument.c atk/atk/atkdocument.c
96 --- orig/atk-1.32.0/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200
97 +++ atk/atk/atkdocument.c 2014-02-17 12:30:58.535192391 +0100
98 @@ -93,7 +93,7 @@ atk_document_base_init (AtkDocumentIface
100 * Returns: a string indicating the document type
102 -G_CONST_RETURN gchar*
104 atk_document_get_document_type (AtkDocument *document)
106 AtkDocumentIface *iface;
107 @@ -155,7 +155,7 @@ atk_document_get_document (AtkDocument *
108 * locale of the document content as a whole, or NULL if
109 * the document content does not specify a locale.
111 -G_CONST_RETURN gchar *
113 atk_document_get_locale (AtkDocument *document)
115 AtkDocumentIface *iface;
116 @@ -219,7 +219,7 @@ atk_document_get_attributes (AtkDocument
117 * document, or NULL if a value for #attribute_name has not been specified
120 -G_CONST_RETURN gchar *
122 atk_document_get_attribute_value (AtkDocument *document,
123 const gchar *attribute_name)
125 Only in atk/atk: atkdocument.c~
126 diff -urpb orig/atk-1.32.0/atk/atkdocument.h atk/atk/atkdocument.h
127 --- orig/atk-1.32.0/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200
128 +++ atk/atk/atkdocument.h 2014-02-17 12:31:31.691190631 +0100
129 @@ -49,12 +49,12 @@ typedef struct _AtkDocumentIface AtkDocu
130 struct _AtkDocumentIface
132 GTypeInterface parent;
133 - G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document);
134 + const gchar* ( *get_document_type) (AtkDocument *document);
135 gpointer ( *get_document) (AtkDocument *document);
137 - G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document);
138 + const gchar* ( *get_document_locale) (AtkDocument *document);
139 AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document);
140 - G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document,
141 + const gchar* ( *get_document_attribute_value) (AtkDocument *document,
142 const gchar *attribute_name);
143 gboolean ( *set_document_attribute) (AtkDocument *document,
144 const gchar *attribute_name,
145 @@ -68,11 +68,11 @@ struct _AtkDocumentIface
147 GType atk_document_get_type (void);
149 -G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document);
150 +const gchar* atk_document_get_document_type (AtkDocument *document);
151 gpointer atk_document_get_document (AtkDocument *document);
152 -G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
153 +const gchar* atk_document_get_locale (AtkDocument *document);
154 AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
155 -G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document,
156 +const gchar* atk_document_get_attribute_value (AtkDocument *document,
157 const gchar *attribute_name);
158 gboolean atk_document_set_attribute_value (AtkDocument *document,
159 const gchar *attribute_name,
160 Only in atk/atk: atkdocument.h~
161 diff -urpb orig/atk-1.32.0/atk/atkimage.c atk/atk/atkimage.c
162 --- orig/atk-1.32.0/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200
163 +++ atk/atk/atkimage.c 2014-02-17 12:30:58.119192299 +0100
164 @@ -46,7 +46,7 @@ atk_image_get_type (void)
166 * Returns: a string representing the image description
168 -G_CONST_RETURN gchar*
170 atk_image_get_image_description (AtkImage *image)
172 AtkImageIface *iface;
173 @@ -192,7 +192,7 @@ atk_image_get_image_position (AtkImage *
174 * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale.
177 -G_CONST_RETURN gchar*
179 atk_image_get_image_locale (AtkImage *image)
182 Only in atk/atk: atkimage.c~
183 diff -urpb orig/atk-1.32.0/atk/atkimage.h atk/atk/atkimage.h
184 --- orig/atk-1.32.0/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200
185 +++ atk/atk/atkimage.h 2014-02-17 12:28:31.599200223 +0100
186 @@ -53,13 +53,13 @@ struct _AtkImageIface
189 AtkCoordType coord_type);
190 - G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image);
191 + const gchar* ( *get_image_description) (AtkImage *image);
192 void ( *get_image_size) (AtkImage *image,
195 gboolean ( *set_image_description) (AtkImage *image,
196 const gchar *description);
197 - G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image);
198 + const gchar* ( *get_image_locale) (AtkImage *image);
202 @@ -67,7 +67,7 @@ struct _AtkImageIface
204 GType atk_image_get_type (void);
206 -G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image);
207 +const gchar* atk_image_get_image_description (AtkImage *image);
209 void atk_image_get_image_size (AtkImage *image,
211 @@ -80,7 +80,7 @@ void atk_image_get_image_position
213 AtkCoordType coord_type);
215 -G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image);
216 +const gchar* atk_image_get_image_locale (AtkImage *image);
220 Only in atk/atk: atkimage.h~
221 diff -urpb orig/atk-1.32.0/atk/atkobject.c atk/atk/atkobject.c
222 --- orig/atk-1.32.0/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200
223 +++ atk/atk/atkobject.c 2014-02-17 12:28:39.467199803 +0100
224 @@ -285,9 +285,9 @@ static void atk_object_real_g
227 static void atk_object_finalize (GObject *object);
228 -static G_CONST_RETURN gchar*
230 atk_object_real_get_name (AtkObject *object);
231 -static G_CONST_RETURN gchar*
233 atk_object_real_get_description
235 static AtkObject* atk_object_real_get_parent (AtkObject *object);
236 @@ -692,7 +692,7 @@ atk_implementor_get_type (void)
238 * Returns: a character string representing the accessible name of the object.
240 -G_CONST_RETURN gchar*
242 atk_object_get_name (AtkObject *accessible)
244 AtkObjectClass *klass;
245 @@ -716,7 +716,7 @@ atk_object_get_name (AtkObject *accessib
249 -G_CONST_RETURN gchar*
251 atk_object_get_description (AtkObject *accessible)
253 AtkObjectClass *klass;
254 @@ -1123,7 +1123,7 @@ atk_object_notify_state_change (AtkObjec
258 - G_CONST_RETURN gchar* name;
261 g_return_if_fail (ATK_IS_OBJECT (accessible));
263 @@ -1319,13 +1319,13 @@ atk_object_finalize (GObject *object)
264 G_OBJECT_CLASS (parent_class)->finalize (object);
267 -static G_CONST_RETURN gchar*
269 atk_object_real_get_name (AtkObject *object)
274 -static G_CONST_RETURN gchar*
276 atk_object_real_get_description (AtkObject *object)
278 return object->description;
279 @@ -1487,7 +1487,7 @@ atk_object_notify (GObject *obj,
281 * Returns: the string describing the AtkRole
283 -G_CONST_RETURN gchar*
285 atk_role_get_name (AtkRole role)
287 if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
288 @@ -1514,7 +1514,7 @@ atk_role_get_name (AtkRole role)
290 * Returns: the localized string describing the AtkRole
292 -G_CONST_RETURN gchar*
294 atk_role_get_localized_name (AtkRole role)
296 gettext_initialization ();
297 Only in atk/atk: atkobject.c~
298 diff -urpb orig/atk-1.32.0/atk/atkobject.h atk/atk/atkobject.h
299 --- orig/atk-1.32.0/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200
300 +++ atk/atk/atkobject.h 2014-02-17 12:28:48.851199302 +0100
301 @@ -381,11 +381,11 @@ struct _AtkObjectClass
303 * Gets the accessible name of the object
305 - G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible);
306 + const gchar* (* get_name) (AtkObject *accessible);
308 * Gets the accessible description of the object
310 - G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible);
311 + const gchar* (* get_description) (AtkObject *accessible);
313 * Gets the accessible parent of the object
315 @@ -535,8 +535,8 @@ AtkObject* atk_implementor_
316 * Properties directly supported by AtkObject
319 -G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible);
320 -G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible);
321 +const gchar* atk_object_get_name (AtkObject *accessible);
322 +const gchar* atk_object_get_description (AtkObject *accessible);
323 AtkObject* atk_object_get_parent (AtkObject *accessible);
324 gint atk_object_get_n_accessible_children (AtkObject *accessible);
325 AtkObject* atk_object_ref_accessible_child (AtkObject *accessible,
326 @@ -571,7 +571,7 @@ void atk_object_notify_s
327 void atk_object_initialize (AtkObject *accessible,
330 -G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
331 +const gchar* atk_role_get_name (AtkRole role);
332 AtkRole atk_role_for_name (const gchar *name);
335 @@ -582,7 +582,7 @@ gboolean atk_object_add_rel
336 gboolean atk_object_remove_relationship (AtkObject *object,
337 AtkRelationType relationship,
339 -G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role);
340 +const gchar* atk_role_get_localized_name (AtkRole role);
344 Only in atk/atk: atkobject.h~
345 diff -urpb orig/atk-1.32.0/atk/atkrelation.c atk/atk/atkrelation.c
346 --- orig/atk-1.32.0/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200
347 +++ atk/atk/atkrelation.c 2014-02-17 12:29:04.307198532 +0100
348 @@ -130,7 +130,7 @@ atk_relation_type_register (const gchar
350 * Returns: the string describing the AtkRelationType
352 -G_CONST_RETURN gchar*
354 atk_relation_type_get_name (AtkRelationType type)
356 GTypeClass *type_class;
357 Only in atk/atk: atkrelation.c~
358 diff -urpb orig/atk-1.32.0/atk/atkrelation.h atk/atk/atkrelation.h
359 --- orig/atk-1.32.0/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200
360 +++ atk/atk/atkrelation.h 2014-02-17 12:29:12.167198142 +0100
361 @@ -61,7 +61,7 @@ struct _AtkRelationClass
362 GType atk_relation_get_type (void);
364 AtkRelationType atk_relation_type_register (const gchar *name);
365 -G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type);
366 +const gchar* atk_relation_type_get_name (AtkRelationType type);
367 AtkRelationType atk_relation_type_for_name (const gchar *name);
370 Only in atk/atk: atkrelation.h~
371 diff -urpb orig/atk-1.32.0/atk/atkstate.c atk/atk/atkstate.c
372 --- orig/atk-1.32.0/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200
373 +++ atk/atk/atkstate.c 2014-02-17 12:29:19.023197754 +0100
374 @@ -57,7 +57,7 @@ atk_state_type_register (const gchar *na
376 * Returns: the string describing the AtkStateType
378 -G_CONST_RETURN gchar*
380 atk_state_type_get_name (AtkStateType type)
382 GTypeClass *type_class;
383 Only in atk/atk: atkstate.c~
384 diff -urpb orig/atk-1.32.0/atk/atkstate.h atk/atk/atkstate.h
385 --- orig/atk-1.32.0/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200
386 +++ atk/atk/atkstate.h 2014-02-17 12:26:44.459205944 +0100
387 @@ -170,7 +170,7 @@ typedef guint64 AtkState;
389 AtkStateType atk_state_type_register (const gchar *name);
391 -G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type);
392 +const gchar* atk_state_type_get_name (AtkStateType type);
393 AtkStateType atk_state_type_for_name (const gchar *name);
396 Only in atk/atk: atkstate.h~
397 diff -urpb orig/atk-1.32.0/atk/atkstreamablecontent.c atk/atk/atkstreamablecontent.c
398 --- orig/atk-1.32.0/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200
399 +++ atk/atk/atkstreamablecontent.c 2014-02-17 12:30:57.659192412 +0100
400 @@ -73,7 +73,7 @@ atk_streamable_content_get_n_mime_types
401 * Returns : a gchar* representing the specified mime type; the caller
402 * should not free the character string.
404 -G_CONST_RETURN gchar*
406 atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
409 Only in atk/atk: atkstreamablecontent.c~
410 diff -urpb orig/atk-1.32.0/atk/atkstreamablecontent.h atk/atk/atkstreamablecontent.h
411 --- orig/atk-1.32.0/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200
412 +++ atk/atk/atkstreamablecontent.h 2014-02-17 12:29:49.487196042 +0100
413 @@ -54,11 +54,11 @@ struct _AtkStreamableContentIface
414 * at index 0 should be considered the "default" data type for the stream.
416 * This assumes that the strings for the mime types are stored in the
417 - * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
418 + * AtkStreamableContent. Alternatively the const could be removed
419 * and the caller would be responsible for calling g_free() on the
422 - G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable,
423 + const gchar* (* get_mime_type) (AtkStreamableContent *streamable,
426 * One possible implementation for this method is that it constructs the
427 @@ -80,7 +80,7 @@ struct _AtkStreamableContentIface
428 * constructed. Note that it is possible for get_uri to return NULL but for
429 * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
431 - G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable,
432 + const gchar* (* get_uri) (AtkStreamableContent *streamable,
433 const gchar *mime_type);
436 @@ -92,7 +92,7 @@ GType atk_streamable_co
438 gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
440 -G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
441 +const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
443 GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable,
444 const gchar *mime_type);
445 Only in atk/atk: atkstreamablecontent.h~
446 diff -urpb orig/atk-1.32.0/atk/atktable.c atk/atk/atktable.c
447 --- orig/atk-1.32.0/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200
448 +++ atk/atk/atktable.c 2014-02-17 12:30:57.319192444 +0100
449 @@ -300,7 +300,7 @@ atk_table_get_n_columns (AtkTable *table
450 * Returns: a gchar* representing the column description, or %NULL
451 * if value does not implement this interface.
453 -G_CONST_RETURN gchar*
455 atk_table_get_column_description (AtkTable *table,
458 @@ -404,7 +404,7 @@ atk_table_get_n_rows (AtkTable *table)
459 * Returns: a gchar* representing the row description, or %NULL
460 * if value does not implement this interface.
462 -G_CONST_RETURN gchar*
464 atk_table_get_row_description (AtkTable *table,
467 Only in atk/atk: atktable.c~
468 diff -urpb orig/atk-1.32.0/atk/atktable.h atk/atk/atktable.h
469 --- orig/atk-1.32.0/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200
470 +++ atk/atk/atktable.h 2014-02-17 12:30:08.035195073 +0100
471 @@ -69,12 +69,12 @@ struct _AtkTableIface
474 (* get_caption) (AtkTable *table);
475 - G_CONST_RETURN gchar*
477 (* get_column_description) (AtkTable *table,
479 AtkObject* (* get_column_header) (AtkTable *table,
481 - G_CONST_RETURN gchar*
483 (* get_row_description) (AtkTable *table,
485 AtkObject* (* get_row_header) (AtkTable *table,
486 @@ -163,12 +163,12 @@ gint atk_table_get_row_exte
489 atk_table_get_caption (AtkTable *table);
490 -G_CONST_RETURN gchar*
492 atk_table_get_column_description (AtkTable *table,
494 AtkObject* atk_table_get_column_header (AtkTable *table,
496 -G_CONST_RETURN gchar*
498 atk_table_get_row_description (AtkTable *table,
500 AtkObject* atk_table_get_row_header (AtkTable *table,
501 Only in atk/atk: atktable.h~
502 diff -urpb orig/atk-1.32.0/atk/atktext.c atk/atk/atktext.c
503 --- orig/atk-1.32.0/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200
504 +++ atk/atk/atktext.c 2014-02-17 12:30:56.871192495 +0100
505 @@ -1054,7 +1054,7 @@ atk_text_attribute_register (const gchar
507 * Returns: a string containing the name; this string should not be freed
509 -G_CONST_RETURN gchar*
511 atk_text_attribute_get_name (AtkTextAttribute attr)
513 GTypeClass *type_class;
514 @@ -1150,7 +1150,7 @@ atk_text_attribute_for_name (const gchar
515 * Returns: a string containing the value; this string should not be freed;
516 * NULL is returned if there are no values maintained for the attr value.
518 -G_CONST_RETURN gchar*
520 atk_text_attribute_get_value (AtkTextAttribute attr,
523 Only in atk/atk: atktext.c~
524 diff -urpb orig/atk-1.32.0/atk/atktext.h atk/atk/atktext.h
525 --- orig/atk-1.32.0/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200
526 +++ atk/atk/atktext.h 2014-02-17 12:30:56.475192626 +0100
527 @@ -355,9 +355,9 @@ AtkTextRange** atk_text_get_bounded_ran
528 AtkTextClipType y_clip_type);
529 void atk_text_free_ranges (AtkTextRange **ranges);
530 void atk_attribute_set_free (AtkAttributeSet *attrib_set);
531 -G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
532 +const gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
533 AtkTextAttribute atk_text_attribute_for_name (const gchar *name);
534 -G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
535 +const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
539 Only in atk/atk: atktext.h~
540 diff -urpb orig/atk-1.32.0/atk/atkutil.c atk/atk/atkutil.c
541 --- orig/atk-1.32.0/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200
542 +++ atk/atk/atkutil.c 2014-02-17 12:30:33.651193705 +0100
543 @@ -340,7 +340,7 @@ atk_get_focus_object (void)
545 * Returns: name string for the GUI toolkit implementing ATK for this application
547 -G_CONST_RETURN gchar*
549 atk_get_toolkit_name (void)
552 @@ -365,7 +365,7 @@ atk_get_toolkit_name (void)
554 * Returns: version string for the GUI toolkit implementing ATK for this application
556 -G_CONST_RETURN gchar*
558 atk_get_toolkit_version (void)
561 @@ -391,7 +391,7 @@ atk_get_toolkit_version (void)
562 * Returns: version string for ATK
565 -G_CONST_RETURN gchar *
567 atk_get_version (void)
570 Only in atk/atk: atkutil.c~
571 diff -urpb orig/atk-1.32.0/atk/atkutil.h atk/atk/atkutil.h
572 --- orig/atk-1.32.0/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200
573 +++ atk/atk/atkutil.h 2014-02-17 12:30:40.635193333 +0100
574 @@ -147,8 +147,8 @@ struct _AtkUtilClass
576 void (* remove_key_event_listener) (guint listener_id);
577 AtkObject* (* get_root) (void);
578 - G_CONST_RETURN gchar* (* get_toolkit_name) (void);
579 - G_CONST_RETURN gchar* (* get_toolkit_version) (void);
580 + const gchar* (* get_toolkit_name) (void);
581 + const gchar* (* get_toolkit_version) (void);
583 GType atk_util_get_type (void);
585 @@ -229,17 +229,17 @@ AtkObject* atk_get_focus_object (void);
587 * Returns name string for the GUI toolkit.
589 -G_CONST_RETURN gchar *atk_get_toolkit_name (void);
590 +const gchar *atk_get_toolkit_name (void);
593 * Returns version string for the GUI toolkit.
595 -G_CONST_RETURN gchar *atk_get_toolkit_version (void);
596 +const gchar *atk_get_toolkit_version (void);
599 * Gets the current version of ATK
601 -G_CONST_RETURN gchar *atk_get_version (void);
602 +const gchar *atk_get_version (void);
604 /* --- GType boilerplate --- */
605 /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
606 Only in atk/atk: atkutil.h~
607 diff -urpb orig/atk-1.32.0/tests/testrelation.c atk/tests/testrelation.c
608 --- orig/atk-1.32.0/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200
609 +++ atk/tests/testrelation.c 2014-02-17 12:53:42.095119569 +0100
610 @@ -28,7 +28,7 @@ static gboolean
613 AtkRelationType type1, type2;
614 - G_CONST_RETURN gchar *name;
619 @@ -169,7 +169,7 @@ static gboolean
622 AtkRole role1, role2;
623 - G_CONST_RETURN gchar *name;
626 name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
627 g_return_val_if_fail (name, FALSE);
628 @@ -230,7 +230,7 @@ static gboolean
629 test_text_attr (void)
631 AtkTextAttribute attr1, attr2;
632 - G_CONST_RETURN gchar *name;
635 name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
636 g_return_val_if_fail (name, FALSE);
637 Only in atk/tests/: testrelation.c~
638 diff -urpb orig/atk-1.32.0/tests/teststateset.c atk/tests/teststateset.c
639 --- orig/atk-1.32.0/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200
640 +++ atk/tests/teststateset.c 2014-02-17 12:53:55.675118832 +0100
641 @@ -208,7 +208,7 @@ static gboolean
644 AtkStateType type1, type2;
645 - G_CONST_RETURN gchar *name;
648 name = atk_state_type_get_name (ATK_STATE_VISIBLE);
649 g_return_val_if_fail (name, FALSE);
652 --- orig/atk-1.32.0/atk/Makefile.in 2010-09-27 09:53:57.000000000 +0200
653 +++ atk/atk/Makefile.in 2014-02-17 12:52:40.443122866 +0100
654 @@ -40,7 +40,7 @@ host_triplet = @host@
655 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelibs_DATA)
657 # ---------- Win32 stuff ----------
658 -@OS_WIN32_TRUE@am__append_3 = -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o
659 +@OS_WIN32_TRUE@am__append_3 = -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o
660 @OS_WIN32_FALSE@libatk_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
661 @OS_WIN32_FALSE@ $(am__DEPENDENCIES_1)
663 @@ -861,7 +861,7 @@ s-enum-types-c: @REBUILD@ $(atk_headers)
664 @HAVE_INTROSPECTION_TRUE@Atk-1.0.gir: libatk-1.0.la Makefile
666 @OS_WIN32_TRUE@install-def-file:
667 -@OS_WIN32_TRUE@ $(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def
668 +@OS_WIN32_TRUE@ $(INSTALL) atk.def $(DESTDIR)$(libdir)/atk-1.0.def
669 @OS_WIN32_TRUE@uninstall-def-file:
670 @OS_WIN32_TRUE@ -rm $(DESTDIR)$(libdir)/atk-1.0.def
671 @OS_WIN32_FALSE@install-def-file: