gtk+ r22502 - in trunk: . docs/reference docs/reference/gtk gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Mar 10 18:58:23 2009
New Revision: 22502
URL: http://svn.gnome.org/viewvc/gtk+?rev=22502&view=rev

Log:
        Bug 574561 â gtk_style_get "shadows" g_object_get

        * gtk/gtk.symbols:
        * gtk/gtkstyle.[hc]: Rename gtk_style_get_property to
        gtk_style_get_style_property to avoid problems for language
        bindings. Pointed out by Torsten Schoenfeld.



Modified:
   trunk/ChangeLog
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/gtk/gtk-sections.txt
   trunk/gtk/gtk.symbols
   trunk/gtk/gtkstyle.c
   trunk/gtk/gtkstyle.h

Modified: trunk/docs/reference/gtk/gtk-sections.txt
==============================================================================
--- trunk/docs/reference/gtk/gtk-sections.txt	(original)
+++ trunk/docs/reference/gtk/gtk-sections.txt	Tue Mar 10 18:58:23 2009
@@ -5779,7 +5779,7 @@
 gtk_style_render_icon
 gtk_style_get_font
 gtk_style_set_font
-gtk_style_get_property
+gtk_style_get_style_property
 gtk_style_get_valist
 gtk_style_get
 gtk_draw_hline

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Tue Mar 10 18:58:23 2009
@@ -1279,7 +1279,7 @@
 gtk_style_render_icon
 gtk_style_set_background
 gtk_draw_insertion_cursor
-gtk_style_get_property
+gtk_style_get_style_property
 gtk_style_get_valist
 gtk_style_get
 #endif

Modified: trunk/gtk/gtkstyle.c
==============================================================================
--- trunk/gtk/gtkstyle.c	(original)
+++ trunk/gtk/gtkstyle.c	Tue Mar 10 18:58:23 2009
@@ -1741,7 +1741,7 @@
 }
 
 /**
- * gtk_style_get_property:
+ * gtk_style_get_style_property:
  * @style: a #GtkStyle
  * @widget_type: the #GType of a descendant of #GtkWidget
  * @property_name: the name of the style property to get
@@ -1754,10 +1754,10 @@
  * Since: 2.16
  */
 void 
-gtk_style_get_property (GtkStyle     *style,
-                        GType        widget_type,
-                        const gchar *property_name,
-                        GValue      *value)
+gtk_style_get_style_property (GtkStyle     *style,
+                              GType        widget_type,
+                              const gchar *property_name,
+                              GValue      *value)
 {
   GtkWidgetClass *klass;
   GParamSpec *pspec;

Modified: trunk/gtk/gtkstyle.h
==============================================================================
--- trunk/gtk/gtkstyle.h	(original)
+++ trunk/gtk/gtkstyle.h	Tue Mar 10 18:58:23 2009
@@ -863,18 +863,18 @@
 GtkBorder *gtk_border_copy     (const GtkBorder *border_);
 void       gtk_border_free     (GtkBorder       *border_);
 
-void gtk_style_get_property (GtkStyle    *style,
-                             GType        widget_type,
-                             const gchar *property_name,
-                             GValue      *value);
-void gtk_style_get_valist   (GtkStyle    *style,
-                             GType        widget_type,
-                             const gchar *first_property_name,
-                             va_list      var_args);
-void gtk_style_get          (GtkStyle    *style,
-                             GType        widget_type,
-                             const gchar *first_property_name,
-                             ...) G_GNUC_NULL_TERMINATED;
+void gtk_style_get_style_property (GtkStyle    *style,
+                                   GType        widget_type,
+                                   const gchar *property_name,
+                                   GValue      *value);
+void gtk_style_get_valist         (GtkStyle    *style,
+                                   GType        widget_type,
+                                   const gchar *first_property_name,
+                                   va_list      var_args);
+void gtk_style_get                (GtkStyle    *style,
+                                   GType        widget_type,
+                                   const gchar *first_property_name,
+                                   ...) G_GNUC_NULL_TERMINATED;
 
 /* --- private API --- */
 const GValue* _gtk_style_peek_property_value (GtkStyle           *style,