Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 288247 Details for
Bug 384919
dev-libs/atk-1.32.0-r1 needs a patch for dev-libs/glib-2.30.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for glib2.30
atk-1.32.0_glib230.patch (text/plain), 25.99 KB, created by
Helmut Jarausch
on 2011-09-29 16:11:37 UTC
(
hide
)
Description:
patch for glib2.30
Filename:
MIME Type:
Creator:
Helmut Jarausch
Created:
2011-09-29 16:11:37 UTC
Size:
25.99 KB
patch
obsolete
>diff -urN atk-1.32.0_ORIG/atk/atkaction.c atk-1.32.0/atk/atkaction.c >--- atk-1.32.0_ORIG/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkaction.c 2011-09-29 18:01:35.533410461 +0200 >@@ -101,7 +101,7 @@ > * Returns a description string, or %NULL > * if @action does not implement this interface. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_action_get_description (AtkAction *obj, > gint i) > { >@@ -140,7 +140,7 @@ > * Returns a name string, or %NULL > * if @action does not implement this interface. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_action_get_name (AtkAction *obj, > gint i) > { >@@ -166,7 +166,7 @@ > * Returns a name string, or %NULL > * if @action does not implement this interface. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_action_get_localized_name (AtkAction *obj, > gint i) > { >@@ -203,7 +203,7 @@ > * if there is no keybinding for this action. > * > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_action_get_keybinding (AtkAction *obj, > gint i) > { >diff -urN atk-1.32.0_ORIG/atk/atkaction.h atk-1.32.0/atk/atkaction.h >--- atk-1.32.0_ORIG/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkaction.h 2011-09-29 18:01:35.553410462 +0200 >@@ -55,16 +55,16 @@ > gboolean (*do_action) (AtkAction *action, > gint i); > gint (*get_n_actions) (AtkAction *action); >- G_CONST_RETURN gchar* (*get_description) (AtkAction *action, >+ const gchar* (*get_description) (AtkAction *action, > gint i); >- G_CONST_RETURN gchar* (*get_name) (AtkAction *action, >+ const gchar* (*get_name) (AtkAction *action, > gint i); >- G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action, >+ const gchar* (*get_keybinding) (AtkAction *action, > gint i); > gboolean (*set_description) (AtkAction *action, > gint i, > const gchar *desc); >- G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action, >+ const gchar* (*get_localized_name)(AtkAction *action, > gint i); > AtkFunction pad2; > }; >@@ -85,11 +85,11 @@ > gboolean atk_action_do_action (AtkAction *action, > gint i); > gint atk_action_get_n_actions (AtkAction *action); >-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action, >+const gchar* atk_action_get_description (AtkAction *action, > gint i); >-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action, >+const gchar* atk_action_get_name (AtkAction *action, > gint i); >-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action, >+const gchar* atk_action_get_keybinding (AtkAction *action, > gint i); > gboolean atk_action_set_description (AtkAction *action, > gint i, >@@ -97,7 +97,7 @@ > > /* NEW in ATK 1.1: */ > >-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action, >+const gchar* atk_action_get_localized_name (AtkAction *action, > gint i); > > /* >diff -urN atk-1.32.0_ORIG/atk/atkdocument.c atk-1.32.0/atk/atkdocument.c >--- atk-1.32.0_ORIG/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkdocument.c 2011-09-29 18:01:35.537410463 +0200 >@@ -93,7 +93,7 @@ > * > * Returns: a string indicating the document type > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_document_get_document_type (AtkDocument *document) > { > AtkDocumentIface *iface; >@@ -155,7 +155,7 @@ > * locale of the document content as a whole, or NULL if > * the document content does not specify a locale. > **/ >-G_CONST_RETURN gchar * >+const gchar * > atk_document_get_locale (AtkDocument *document) > { > AtkDocumentIface *iface; >@@ -219,7 +219,7 @@ > * document, or NULL if a value for #attribute_name has not been specified > * for this document. > */ >-G_CONST_RETURN gchar * >+const gchar * > atk_document_get_attribute_value (AtkDocument *document, > const gchar *attribute_name) > { >diff -urN atk-1.32.0_ORIG/atk/atkdocument.h atk-1.32.0/atk/atkdocument.h >--- atk-1.32.0_ORIG/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkdocument.h 2011-09-29 18:01:35.513410461 +0200 >@@ -49,12 +49,12 @@ > struct _AtkDocumentIface > { > GTypeInterface parent; >- G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document); >+ const gchar* ( *get_document_type) (AtkDocument *document); > gpointer ( *get_document) (AtkDocument *document); > >- G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document); >+ const gchar* ( *get_document_locale) (AtkDocument *document); > AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document); >- G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document, >+ const gchar* ( *get_document_attribute_value) (AtkDocument *document, > const gchar *attribute_name); > gboolean ( *set_document_attribute) (AtkDocument *document, > const gchar *attribute_name, >@@ -68,11 +68,11 @@ > > GType atk_document_get_type (void); > >-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document); >+const gchar* atk_document_get_document_type (AtkDocument *document); > gpointer atk_document_get_document (AtkDocument *document); >-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document); >+const gchar* atk_document_get_locale (AtkDocument *document); > AtkAttributeSet* atk_document_get_attributes (AtkDocument *document); >-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document, >+const gchar* atk_document_get_attribute_value (AtkDocument *document, > const gchar *attribute_name); > gboolean atk_document_set_attribute_value (AtkDocument *document, > const gchar *attribute_name, >diff -urN atk-1.32.0_ORIG/atk/atkimage.c atk-1.32.0/atk/atkimage.c >--- atk-1.32.0_ORIG/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkimage.c 2011-09-29 18:01:35.540410462 +0200 >@@ -46,7 +46,7 @@ > * > * Returns: a string representing the image description > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_image_get_image_description (AtkImage *image) > { > AtkImageIface *iface; >@@ -192,7 +192,7 @@ > * 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. > * > */ >-G_CONST_RETURN gchar* >+const gchar* > atk_image_get_image_locale (AtkImage *image) > { > >diff -urN atk-1.32.0_ORIG/atk/atkimage.h atk-1.32.0/atk/atkimage.h >--- atk-1.32.0_ORIG/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkimage.h 2011-09-29 18:01:35.548410462 +0200 >@@ -53,13 +53,13 @@ > gint *x, > gint *y, > AtkCoordType coord_type); >- G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image); >+ const gchar* ( *get_image_description) (AtkImage *image); > void ( *get_image_size) (AtkImage *image, > gint *width, > gint *height); > gboolean ( *set_image_description) (AtkImage *image, > const gchar *description); >- G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image); >+ const gchar* ( *get_image_locale) (AtkImage *image); > > AtkFunction pad1; > >@@ -67,7 +67,7 @@ > > GType atk_image_get_type (void); > >-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image); >+const gchar* atk_image_get_image_description (AtkImage *image); > > void atk_image_get_image_size (AtkImage *image, > gint *width, >@@ -80,7 +80,7 @@ > gint *y, > AtkCoordType coord_type); > >-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image); >+const gchar* atk_image_get_image_locale (AtkImage *image); > > G_END_DECLS > >diff -urN atk-1.32.0_ORIG/atk/atkobject.c atk-1.32.0/atk/atkobject.c >--- atk-1.32.0_ORIG/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkobject.c 2011-09-29 18:01:35.517410461 +0200 >@@ -285,9 +285,9 @@ > GValue *value, > GParamSpec *pspec); > static void atk_object_finalize (GObject *object); >-static G_CONST_RETURN gchar* >+static const gchar* > atk_object_real_get_name (AtkObject *object); >-static G_CONST_RETURN gchar* >+static const gchar* > atk_object_real_get_description > (AtkObject *object); > static AtkObject* atk_object_real_get_parent (AtkObject *object); >@@ -692,7 +692,7 @@ > * > * Returns: a character string representing the accessible name of the object. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_object_get_name (AtkObject *accessible) > { > AtkObjectClass *klass; >@@ -716,7 +716,7 @@ > * of the accessible. > * > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_object_get_description (AtkObject *accessible) > { > AtkObjectClass *klass; >@@ -1123,7 +1123,7 @@ > AtkState state, > gboolean value) > { >- G_CONST_RETURN gchar* name; >+ const gchar* name; > > g_return_if_fail (ATK_IS_OBJECT (accessible)); > >@@ -1319,13 +1319,13 @@ > G_OBJECT_CLASS (parent_class)->finalize (object); > } > >-static G_CONST_RETURN gchar* >+static const gchar* > atk_object_real_get_name (AtkObject *object) > { > return object->name; > } > >-static G_CONST_RETURN gchar* >+static const gchar* > atk_object_real_get_description (AtkObject *object) > { > return object->description; >@@ -1487,7 +1487,7 @@ > * > * Returns: the string describing the AtkRole > */ >-G_CONST_RETURN gchar* >+const gchar* > atk_role_get_name (AtkRole role) > { > if (role >= 0 && role < ATK_ROLE_LAST_DEFINED) >@@ -1514,7 +1514,7 @@ > * > * Returns: the localized string describing the AtkRole > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_role_get_localized_name (AtkRole role) > { > gettext_initialization (); >diff -urN atk-1.32.0_ORIG/atk/atkobject.h atk-1.32.0/atk/atkobject.h >--- atk-1.32.0_ORIG/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkobject.h 2011-09-29 18:01:35.539410463 +0200 >@@ -381,11 +381,11 @@ > /* > * Gets the accessible name of the object > */ >- G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible); >+ const gchar* (* get_name) (AtkObject *accessible); > /* > * Gets the accessible description of the object > */ >- G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible); >+ const gchar* (* get_description) (AtkObject *accessible); > /* > * Gets the accessible parent of the object > */ >@@ -535,8 +535,8 @@ > * Properties directly supported by AtkObject > */ > >-G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible); >-G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible); >+const gchar* atk_object_get_name (AtkObject *accessible); >+const gchar* atk_object_get_description (AtkObject *accessible); > AtkObject* atk_object_get_parent (AtkObject *accessible); > gint atk_object_get_n_accessible_children (AtkObject *accessible); > AtkObject* atk_object_ref_accessible_child (AtkObject *accessible, >@@ -571,7 +571,7 @@ > void atk_object_initialize (AtkObject *accessible, > gpointer data); > >-G_CONST_RETURN gchar* atk_role_get_name (AtkRole role); >+const gchar* atk_role_get_name (AtkRole role); > AtkRole atk_role_for_name (const gchar *name); > > >@@ -582,7 +582,7 @@ > gboolean atk_object_remove_relationship (AtkObject *object, > AtkRelationType relationship, > AtkObject *target); >-G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role); >+const gchar* atk_role_get_localized_name (AtkRole role); > > /* */ > >diff -urN atk-1.32.0_ORIG/atk/atkrelation.c atk-1.32.0/atk/atkrelation.c >--- atk-1.32.0_ORIG/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkrelation.c 2011-09-29 18:01:35.550410462 +0200 >@@ -130,7 +130,7 @@ > * > * Returns: the string describing the AtkRelationType > */ >-G_CONST_RETURN gchar* >+const gchar* > atk_relation_type_get_name (AtkRelationType type) > { > GTypeClass *type_class; >diff -urN atk-1.32.0_ORIG/atk/atkrelation.h atk-1.32.0/atk/atkrelation.h >--- atk-1.32.0_ORIG/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkrelation.h 2011-09-29 18:01:35.518410461 +0200 >@@ -61,7 +61,7 @@ > GType atk_relation_get_type (void); > > AtkRelationType atk_relation_type_register (const gchar *name); >-G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type); >+const gchar* atk_relation_type_get_name (AtkRelationType type); > AtkRelationType atk_relation_type_for_name (const gchar *name); > > /* >diff -urN atk-1.32.0_ORIG/atk/atkstate.c atk-1.32.0/atk/atkstate.c >--- atk-1.32.0_ORIG/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkstate.c 2011-09-29 18:01:35.543410462 +0200 >@@ -57,7 +57,7 @@ > * > * Returns: the string describing the AtkStateType > */ >-G_CONST_RETURN gchar* >+const gchar* > atk_state_type_get_name (AtkStateType type) > { > GTypeClass *type_class; >diff -urN atk-1.32.0_ORIG/atk/atkstate.h atk-1.32.0/atk/atkstate.h >--- atk-1.32.0_ORIG/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkstate.h 2011-09-29 18:01:35.524410461 +0200 >@@ -170,7 +170,7 @@ > > AtkStateType atk_state_type_register (const gchar *name); > >-G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type); >+const gchar* atk_state_type_get_name (AtkStateType type); > AtkStateType atk_state_type_for_name (const gchar *name); > > G_END_DECLS >diff -urN atk-1.32.0_ORIG/atk/atkstreamablecontent.c atk-1.32.0/atk/atkstreamablecontent.c >--- atk-1.32.0_ORIG/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkstreamablecontent.c 2011-09-29 18:01:35.542410462 +0200 >@@ -73,7 +73,7 @@ > * Returns : a gchar* representing the specified mime type; the caller > * should not free the character string. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, > gint i) > { >diff -urN atk-1.32.0_ORIG/atk/atkstreamablecontent.h atk-1.32.0/atk/atkstreamablecontent.h >--- atk-1.32.0_ORIG/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkstreamablecontent.h 2011-09-29 18:01:35.546410462 +0200 >@@ -54,11 +54,11 @@ > * at index 0 should be considered the "default" data type for the stream. > * > * This assumes that the strings for the mime types are stored in the >- * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed >+ * AtkStreamableContent. Alternatively the const could be removed > * and the caller would be responsible for calling g_free() on the > * returned value. > */ >- G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable, >+ const gchar* (* get_mime_type) (AtkStreamableContent *streamable, > gint i); > /* > * One possible implementation for this method is that it constructs the >@@ -80,7 +80,7 @@ > * constructed. Note that it is possible for get_uri to return NULL but for > * get_stream to work nonetheless, since not all GIOChannels connect to URIs. > */ >- G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable, >+ const gchar* (* get_uri) (AtkStreamableContent *streamable, > const gchar *mime_type); > > >@@ -92,7 +92,7 @@ > > gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable); > >-G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, >+const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, > gint i); > GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable, > const gchar *mime_type); >diff -urN atk-1.32.0_ORIG/atk/atktable.c atk-1.32.0/atk/atktable.c >--- atk-1.32.0_ORIG/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atktable.c 2011-09-29 18:01:35.528410461 +0200 >@@ -300,7 +300,7 @@ > * Returns: a gchar* representing the column description, or %NULL > * if value does not implement this interface. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_table_get_column_description (AtkTable *table, > gint column) > { >@@ -404,7 +404,7 @@ > * Returns: a gchar* representing the row description, or %NULL > * if value does not implement this interface. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_table_get_row_description (AtkTable *table, > gint row) > { >diff -urN atk-1.32.0_ORIG/atk/atktable.h atk-1.32.0/atk/atktable.h >--- atk-1.32.0_ORIG/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atktable.h 2011-09-29 18:01:35.547410462 +0200 >@@ -69,12 +69,12 @@ > gint column); > AtkObject* > (* get_caption) (AtkTable *table); >- G_CONST_RETURN gchar* >+ const gchar* > (* get_column_description) (AtkTable *table, > gint column); > AtkObject* (* get_column_header) (AtkTable *table, > gint column); >- G_CONST_RETURN gchar* >+ const gchar* > (* get_row_description) (AtkTable *table, > gint row); > AtkObject* (* get_row_header) (AtkTable *table, >@@ -163,12 +163,12 @@ > gint column); > AtkObject* > atk_table_get_caption (AtkTable *table); >-G_CONST_RETURN gchar* >+const gchar* > atk_table_get_column_description (AtkTable *table, > gint column); > AtkObject* atk_table_get_column_header (AtkTable *table, > gint column); >-G_CONST_RETURN gchar* >+const gchar* > atk_table_get_row_description (AtkTable *table, > gint row); > AtkObject* atk_table_get_row_header (AtkTable *table, >diff -urN atk-1.32.0_ORIG/atk/atktext.c atk-1.32.0/atk/atktext.c >--- atk-1.32.0_ORIG/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200 >+++ atk-1.32.0/atk/atktext.c 2011-09-29 18:01:35.532410461 +0200 >@@ -1054,7 +1054,7 @@ > * > * Returns: a string containing the name; this string should not be freed > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_text_attribute_get_name (AtkTextAttribute attr) > { > GTypeClass *type_class; >@@ -1150,7 +1150,7 @@ > * Returns: a string containing the value; this string should not be freed; > * NULL is returned if there are no values maintained for the attr value. > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_text_attribute_get_value (AtkTextAttribute attr, > gint index) > { >diff -urN atk-1.32.0_ORIG/atk/atktext.h atk-1.32.0/atk/atktext.h >--- atk-1.32.0_ORIG/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200 >+++ atk-1.32.0/atk/atktext.h 2011-09-29 18:01:35.552410462 +0200 >@@ -355,9 +355,9 @@ > AtkTextClipType y_clip_type); > void atk_text_free_ranges (AtkTextRange **ranges); > void atk_attribute_set_free (AtkAttributeSet *attrib_set); >-G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr); >+const gchar* atk_text_attribute_get_name (AtkTextAttribute attr); > AtkTextAttribute atk_text_attribute_for_name (const gchar *name); >-G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr, >+const gchar* atk_text_attribute_get_value (AtkTextAttribute attr, > gint index_); > > G_END_DECLS >diff -urN atk-1.32.0_ORIG/atk/atkutil.c atk-1.32.0/atk/atkutil.c >--- atk-1.32.0_ORIG/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkutil.c 2011-09-29 18:01:35.535410461 +0200 >@@ -340,7 +340,7 @@ > * > * Returns: name string for the GUI toolkit implementing ATK for this application > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_get_toolkit_name (void) > { > const gchar *retval; >@@ -365,7 +365,7 @@ > * > * Returns: version string for the GUI toolkit implementing ATK for this application > **/ >-G_CONST_RETURN gchar* >+const gchar* > atk_get_toolkit_version (void) > { > const gchar *retval; >@@ -391,7 +391,7 @@ > * Returns: version string for ATK > **/ > >-G_CONST_RETURN gchar * >+const gchar * > atk_get_version (void) > { > return VERSION; >diff -urN atk-1.32.0_ORIG/atk/atkutil.h atk-1.32.0/atk/atkutil.h >--- atk-1.32.0_ORIG/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/atk/atkutil.h 2011-09-29 18:01:35.525410461 +0200 >@@ -147,8 +147,8 @@ > gpointer data); > void (* remove_key_event_listener) (guint listener_id); > AtkObject* (* get_root) (void); >- G_CONST_RETURN gchar* (* get_toolkit_name) (void); >- G_CONST_RETURN gchar* (* get_toolkit_version) (void); >+ const gchar* (* get_toolkit_name) (void); >+ const gchar* (* get_toolkit_version) (void); > }; > GType atk_util_get_type (void); > >@@ -229,17 +229,17 @@ > /* > * Returns name string for the GUI toolkit. > */ >-G_CONST_RETURN gchar *atk_get_toolkit_name (void); >+const gchar *atk_get_toolkit_name (void); > > /* > * Returns version string for the GUI toolkit. > */ >-G_CONST_RETURN gchar *atk_get_toolkit_version (void); >+const gchar *atk_get_toolkit_version (void); > > /* > * Gets the current version of ATK > */ >-G_CONST_RETURN gchar *atk_get_version (void); >+const gchar *atk_get_version (void); > > /* --- GType boilerplate --- */ > /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will: >diff -urN atk-1.32.0_ORIG/ChangeLog atk-1.32.0/ChangeLog >--- atk-1.32.0_ORIG/ChangeLog 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/ChangeLog 2011-09-29 18:01:35.387410460 +0200 >@@ -3047,7 +3047,7 @@ > Change AtkHyperLink to AtkHyperlink > * atk/atktable.[c|h]: > Make gchar* arguments const; make return value of type gchar* >- G_CONST_RETURN >+ const > * docs/atk-sections.txt > Remove reference to AtkHyperLink > * docs/atk-used.sgml, docs/tmpl/atkhyperlink.sgml >diff -urN atk-1.32.0_ORIG/tests/testrelation.c atk-1.32.0/tests/testrelation.c >--- atk-1.32.0_ORIG/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/tests/testrelation.c 2011-09-29 18:01:35.394410460 +0200 >@@ -28,7 +28,7 @@ > test_relation (void) > { > AtkRelationType type1, type2; >- G_CONST_RETURN gchar *name; >+ const gchar *name; > AtkObject *obj; > gboolean ret_value; > AtkRelationSet *set; >@@ -169,7 +169,7 @@ > test_role (void) > { > AtkRole role1, role2; >- G_CONST_RETURN gchar *name; >+ const gchar *name; > > name = atk_role_get_name (ATK_ROLE_PAGE_TAB); > g_return_val_if_fail (name, FALSE); >@@ -230,7 +230,7 @@ > test_text_attr (void) > { > AtkTextAttribute attr1, attr2; >- G_CONST_RETURN gchar *name; >+ const gchar *name; > > name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP); > g_return_val_if_fail (name, FALSE); >diff -urN atk-1.32.0_ORIG/tests/teststateset.c atk-1.32.0/tests/teststateset.c >--- atk-1.32.0_ORIG/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200 >+++ atk-1.32.0/tests/teststateset.c 2011-09-29 18:01:35.392410460 +0200 >@@ -208,7 +208,7 @@ > test_state (void) > { > AtkStateType type1, type2; >- G_CONST_RETURN gchar *name; >+ const gchar *name; > > name = atk_state_type_get_name (ATK_STATE_VISIBLE); > g_return_val_if_fail (name, FALSE);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=288247">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 384919
:
288245
| 288247
