diff options
| author | Johan Dahlin <jdahlin@async.com.br> | 2007-06-19 12:23:36 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2007-06-19 12:23:36 +0000 |
| commit | 60a409785facbef5ba61c0bb1e396ec027e02bbc (patch) | |
| tree | ddcf183272d6352f3f57b8e13ddcb0ede4c885f9 /gtk/gtkwidget.c | |
| parent | 2e654b1671ea5451cc1ca8ed8a03380e2b175f7e (diff) | |
| download | gtk+-60a409785facbef5ba61c0bb1e396ec027e02bbc.tar.gz | |
Rename buildable methods to not clash with widget methods. (#448928,
2007-06-19 Johan Dahlin <jdahlin@async.com.br>
* gtk/*: Rename buildable methods to not clash with widget
methods. (#448928, Torsten Schoenfeld)
svn path=/trunk/; revision=18187
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 166fe6b20f..2a54b6e9e3 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -251,10 +251,10 @@ static void gtk_widget_buildable_interface_init (GtkBuildableIfa static void gtk_widget_buildable_set_name (GtkBuildable *buildable, const gchar *name); static const gchar * gtk_widget_buildable_get_name (GtkBuildable *buildable); -static void gtk_widget_buildable_set_property (GtkBuildable *buildable, - GtkBuilder *builder, - const gchar *name, - const GValue *value); +static void gtk_widget_buildable_set_buildable_property (GtkBuildable *buildable, + GtkBuilder *builder, + const gchar *name, + const GValue *value); static gboolean gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, @@ -8446,7 +8446,7 @@ gtk_widget_buildable_interface_init (GtkBuildableIface *iface) iface->set_name = gtk_widget_buildable_set_name; iface->get_name = gtk_widget_buildable_get_name; - iface->set_property = gtk_widget_buildable_set_property; + iface->set_buildable_property = gtk_widget_buildable_set_buildable_property; iface->parser_finished = gtk_widget_buildable_parser_finshed; iface->custom_tag_start = gtk_widget_buildable_custom_tag_start; iface->custom_finished = gtk_widget_buildable_custom_finshed; @@ -8466,10 +8466,10 @@ gtk_widget_buildable_get_name (GtkBuildable *buildable) } static void -gtk_widget_buildable_set_property (GtkBuildable *buildable, - GtkBuilder *builder, - const gchar *name, - const GValue *value) +gtk_widget_buildable_set_buildable_property (GtkBuildable *buildable, + GtkBuilder *builder, + const gchar *name, + const GValue *value) { if (strcmp (name, "has-default") == 0 && g_value_get_boolean (value)) g_object_set_qdata (G_OBJECT (buildable), quark_builder_has_default, |