summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--docs/reference/gtk/gtk-sections.txt4
-rw-r--r--docs/reference/gtk/tmpl/gtkbuildable.sgml4
-rw-r--r--gtk/gtk.symbols4
-rw-r--r--gtk/gtkactiongroup.c18
-rw-r--r--gtk/gtkbuildable.c28
-rw-r--r--gtk/gtkbuildable.h142
-rw-r--r--gtk/gtkbuilder.c8
-rw-r--r--gtk/gtkcelllayout.c8
-rw-r--r--gtk/gtkcelllayout.h2
-rw-r--r--gtk/gtkcellview.c2
-rw-r--r--gtk/gtkcombobox.c2
-rw-r--r--gtk/gtkcontainer.c12
-rw-r--r--gtk/gtkentrycompletion.c2
-rw-r--r--gtk/gtkexpander.c12
-rw-r--r--gtk/gtkframe.c12
-rw-r--r--gtk/gtkiconview.c2
-rw-r--r--gtk/gtknotebook.c12
-rw-r--r--gtk/gtktreeview.c20
-rw-r--r--gtk/gtktreeviewcolumn.c2
-rw-r--r--gtk/gtkuimanager.c20
-rw-r--r--gtk/gtkwidget.c18
-rw-r--r--gtk/gtkwindow.c20
23 files changed, 182 insertions, 177 deletions
diff --git a/ChangeLog b/ChangeLog
index 21cfb107aa..76924a201a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-19 Johan Dahlin <jdahlin@async.com.br>
+
+ * gtk/*: Rename buildable methods to not clash with widget
+ methods. (#448928, Torsten Schoenfeld)
+
2007-06-19 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c: Use g_timeout_add_seconds_full() for
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 7a3be12593..7a45354254 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -452,8 +452,8 @@ GtkBuildable
GtkBuildableIface
gtk_buildable_set_name
gtk_buildable_get_name
-gtk_buildable_add
-gtk_buildable_set_property
+gtk_buildable_add_child
+gtk_buildable_set_buildable_property
gtk_buildable_construct_child
gtk_buildable_custom_tag_start
gtk_buildable_custom_tag_end
diff --git a/docs/reference/gtk/tmpl/gtkbuildable.sgml b/docs/reference/gtk/tmpl/gtkbuildable.sgml
index 8080455758..8fd5f5d020 100644
--- a/docs/reference/gtk/tmpl/gtkbuildable.sgml
+++ b/docs/reference/gtk/tmpl/gtkbuildable.sgml
@@ -58,7 +58,7 @@ SEE ALSO
@Returns:
-<!-- ##### FUNCTION gtk_buildable_add ##### -->
+<!-- ##### FUNCTION gtk_buildable_add_child ##### -->
<para>
</para>
@@ -69,7 +69,7 @@ SEE ALSO
@type:
-<!-- ##### FUNCTION gtk_buildable_set_property ##### -->
+<!-- ##### FUNCTION gtk_buildable_set_buildable_property ##### -->
<para>
</para>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index b06f781efb..c3775ee581 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -423,7 +423,7 @@ gtk_box_set_spacing
#if IN_HEADER(__GTK_BUILDABLE_H__)
#if IN_FILE(__GTK_BUILDABLE_C__)
-gtk_buildable_add
+gtk_buildable_add_child
gtk_buildable_construct_child
gtk_buildable_custom_tag_start
gtk_buildable_custom_tag_end
@@ -433,7 +433,7 @@ gtk_buildable_get_name
gtk_buildable_get_type G_GNUC_CONST
gtk_buildable_parser_finished
gtk_buildable_set_name
-gtk_buildable_set_property
+gtk_buildable_set_buildable_property
#endif
#endif
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index c976b46e11..34ca057bb3 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -90,10 +90,10 @@ static GtkAction *gtk_action_group_real_get_action (GtkActionGroup *self,
/* GtkBuildable */
static void gtk_action_group_buildable_init (GtkBuildableIface *iface);
-static void gtk_action_group_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type);
+static void gtk_action_group_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
static void gtk_action_group_buildable_set_name (GtkBuildable *buildable,
const gchar *name);
static const gchar* gtk_action_group_buildable_get_name (GtkBuildable *buildable);
@@ -295,16 +295,16 @@ gtk_action_group_init (GtkActionGroup *self)
static void
gtk_action_group_buildable_init (GtkBuildableIface *iface)
{
- iface->add = gtk_action_group_buildable_add;
+ iface->add_child = gtk_action_group_buildable_add_child;
iface->set_name = gtk_action_group_buildable_set_name;
iface->get_name = gtk_action_group_buildable_get_name;
}
static void
-gtk_action_group_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_action_group_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
gtk_action_group_add_action (GTK_ACTION_GROUP (buildable),
GTK_ACTION (child));
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index acac25fe82..e5dbf56995 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -103,7 +103,7 @@ gtk_buildable_get_name (GtkBuildable *buildable)
}
/**
- * gtk_buildable_add:
+ * gtk_buildable_add_child:
* @buildable: a #GtkBuildable
* @builder: a #GtkBuilder
* @child: child to add
@@ -119,10 +119,10 @@ gtk_buildable_get_name (GtkBuildable *buildable)
* Since: 2.12
**/
void
-gtk_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
GtkBuildableIface *iface;
@@ -130,13 +130,13 @@ gtk_buildable_add (GtkBuildable *buildable,
g_return_if_fail (GTK_IS_BUILDER (builder));
iface = GTK_BUILDABLE_GET_IFACE (buildable);
- g_return_if_fail (iface->add != NULL);
+ g_return_if_fail (iface->add_child != NULL);
- (* iface->add) (buildable, builder, child, type);
+ (* iface->add_child) (buildable, builder, child, type);
}
/**
- * gtk_buildable_set_property:
+ * gtk_buildable_set_buildable_property:
* @buildable: a #GtkBuildable
* @builder: a #GtkBuilder
* @name: name of property
@@ -154,10 +154,10 @@ gtk_buildable_add (GtkBuildable *buildable,
* Since: 2.12
**/
void
-gtk_buildable_set_property (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name,
- const GValue *value)
+gtk_buildable_set_buildable_property (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name,
+ const GValue *value)
{
GtkBuildableIface *iface;
@@ -167,8 +167,8 @@ gtk_buildable_set_property (GtkBuildable *buildable,
g_return_if_fail (value != NULL);
iface = GTK_BUILDABLE_GET_IFACE (buildable);
- if (iface->set_property)
- (* iface->set_property) (buildable, builder, name, value);
+ if (iface->set_buildable_property)
+ (* iface->set_buildable_property) (buildable, builder, name, value);
else
g_object_set_property (G_OBJECT (buildable), name, value);
}
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 397e4e8745..00f71cd4c0 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -41,82 +41,82 @@ struct _GtkBuildableIface
GTypeInterface g_iface;
/* virtual table */
- void (* set_name) (GtkBuildable *buildable,
- const gchar *name);
- const gchar * (* get_name) (GtkBuildable *buildable);
- void (* add) (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type);
- void (* set_property) (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name,
- const GValue *value);
- GObject * (* construct_child) (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name);
- gboolean (* custom_tag_start) (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *tagname,
- GMarkupParser *parser,
- gpointer *data);
- void (* custom_tag_end) (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *tagname,
- gpointer *data);
- void (* custom_finished) (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *tagname,
- gpointer data);
- void (* parser_finished) (GtkBuildable *buildable,
- GtkBuilder *builder);
+ void (* set_name) (GtkBuildable *buildable,
+ const gchar *name);
+ const gchar * (* get_name) (GtkBuildable *buildable);
+ void (* add_child) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
+ void (* set_buildable_property) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name,
+ const GValue *value);
+ GObject * (* construct_child) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name);
+ gboolean (* custom_tag_start) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ GMarkupParser *parser,
+ gpointer *data);
+ void (* custom_tag_end) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer *data);
+ void (* custom_finished) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer data);
+ void (* parser_finished) (GtkBuildable *buildable,
+ GtkBuilder *builder);
- GObject * (* get_internal_child) (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *childname);
+ GObject * (* get_internal_child) (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *childname);
};
-GType gtk_buildable_get_type (void) G_GNUC_CONST;
+GType gtk_buildable_get_type (void) G_GNUC_CONST;
-void gtk_buildable_set_name (GtkBuildable *buildable,
- const gchar *name);
-const gchar * gtk_buildable_get_name (GtkBuildable *buildable);
-void gtk_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type);
-void gtk_buildable_set_property (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name,
- const GValue *value);
-GObject * gtk_buildable_construct_child (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name);
-gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *tagname,
- GMarkupParser *parser,
- gpointer *data);
-void gtk_buildable_custom_tag_end (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *tagname,
- gpointer *data);
-void gtk_buildable_custom_finished (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *tagname,
- gpointer data);
-void gtk_buildable_parser_finished (GtkBuildable *buildable,
- GtkBuilder *builder);
-GObject * gtk_buildable_get_internal_child (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *childname);
+void gtk_buildable_set_name (GtkBuildable *buildable,
+ const gchar *name);
+const gchar * gtk_buildable_get_name (GtkBuildable *buildable);
+void gtk_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
+void gtk_buildable_set_buildable_property (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name,
+ const GValue *value);
+GObject * gtk_buildable_construct_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name);
+gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ GMarkupParser *parser,
+ gpointer *data);
+void gtk_buildable_custom_tag_end (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer *data);
+void gtk_buildable_custom_finished (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer data);
+void gtk_buildable_parser_finished (GtkBuildable *buildable,
+ GtkBuilder *builder);
+GObject * gtk_buildable_get_internal_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *childname);
G_END_DECLS
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index fbec88c0dd..145f7d9356 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -421,7 +421,7 @@ _gtk_builder_construct (GtkBuilder *builder,
{
buildable = GTK_BUILDABLE (obj);
iface = GTK_BUILDABLE_GET_IFACE (obj);
- if (iface->set_property)
+ if (iface->set_buildable_property)
custom_set_property = TRUE;
}
@@ -429,7 +429,7 @@ _gtk_builder_construct (GtkBuilder *builder,
{
GParameter *param = &g_array_index (parameters, GParameter, i);
if (custom_set_property)
- iface->set_property (buildable, builder, param->name, &param->value);
+ iface->set_buildable_property (buildable, builder, param->name, &param->value);
else
g_object_set_property (obj, param->name, &param->value);
@@ -502,8 +502,8 @@ _gtk_builder_add (GtkBuilder *builder,
gtk_buildable_get_name (GTK_BUILDABLE (object)),
gtk_buildable_get_name (GTK_BUILDABLE (parent))));
- gtk_buildable_add (GTK_BUILDABLE (parent), builder, object,
- child_info->type);
+ gtk_buildable_add_child (GTK_BUILDABLE (parent), builder, object,
+ child_info->type);
child_info->added = TRUE;
}
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 89f0a1ab03..9fba57bf0f 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -406,10 +406,10 @@ _gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
}
void
-_gtk_cell_layout_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+_gtk_cell_layout_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
GtkCellLayoutIface *iface;
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 8e2e272cb2..3f03687a10 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -110,7 +110,7 @@ void _gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
GObject *child,
const gchar *tagname,
gpointer *data);
-void _gtk_cell_layout_buildable_add (GtkBuildable *buildable,
+void _gtk_cell_layout_buildable_add_child (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *type);
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index f9d49896ad..65f760b8d8 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -198,7 +198,7 @@ static void
gtk_cell_view_buildable_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
- iface->add = _gtk_cell_layout_buildable_add;
+ iface->add_child = _gtk_cell_layout_buildable_add_child;
iface->custom_tag_start = gtk_cell_view_buildable_custom_tag_start;
iface->custom_tag_end = gtk_cell_view_buildable_custom_tag_end;
}
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 742de106e5..424d73323b 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -835,7 +835,7 @@ static void
gtk_combo_box_buildable_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
- iface->add = _gtk_cell_layout_buildable_add;
+ iface->add_child = _gtk_cell_layout_buildable_add_child;
iface->custom_tag_start = gtk_combo_box_buildable_custom_tag_start;
iface->custom_tag_end = gtk_combo_box_buildable_custom_tag_end;
}
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 1ed606e85e..3366df0224 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -102,7 +102,7 @@ static gchar* gtk_container_child_default_composite_name (GtkContainer *containe
/* GtkBuildable */
static void gtk_container_buildable_init (GtkBuildableIface *iface);
-static void gtk_container_buildable_add (GtkBuildable *buildable,
+static void gtk_container_buildable_add_child (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *type);
@@ -296,16 +296,16 @@ static void
gtk_container_buildable_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
- iface->add = gtk_container_buildable_add;
+ iface->add_child = gtk_container_buildable_add_child;
iface->custom_tag_start = gtk_container_buildable_custom_tag_start;
iface->custom_tag_end = gtk_container_buildable_custom_tag_end;
}
static void
-gtk_container_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_container_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
g_return_if_fail (GTK_IS_WIDGET (child));
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 53b87748b9..b4c748aa3d 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -395,7 +395,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
static void
gtk_entry_completion_buildable_init (GtkBuildableIface *iface)
{
- iface->add = _gtk_cell_layout_buildable_add;
+ iface->add_child = _gtk_cell_layout_buildable_add_child;
iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
iface->custom_tag_end = _gtk_cell_layout_buildable_custom_tag_end;
}
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 62c08cd356..e201e8ec0c 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -129,7 +129,7 @@ static void get_expander_bounds (GtkExpander *expander,
/* GtkBuildable */
static void gtk_expander_buildable_init (GtkBuildableIface *iface);
-static void gtk_expander_buildable_add (GtkBuildable *buildable,
+static void gtk_expander_buildable_add_child (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *type);
@@ -288,10 +288,10 @@ gtk_expander_init (GtkExpander *expander)
}
static void
-gtk_expander_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_expander_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
if (!type)
gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
@@ -304,7 +304,7 @@ gtk_expander_buildable_add (GtkBuildable *buildable,
static void
gtk_expander_buildable_init (GtkBuildableIface *iface)
{
- iface->add = gtk_expander_buildable_add;
+ iface->add_child = gtk_expander_buildable_add_child;
}
static void
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index fba55df934..b27fdb205a 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -76,7 +76,7 @@ static void gtk_frame_real_compute_child_allocation (GtkFrame *frame,
/* GtkBuildable */
static void gtk_frame_buildable_init (GtkBuildableIface *iface);
-static void gtk_frame_buildable_add (GtkBuildable *buildable,
+static void gtk_frame_buildable_add_child (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *type);
@@ -162,14 +162,14 @@ gtk_frame_class_init (GtkFrameClass *class)
static void
gtk_frame_buildable_init (GtkBuildableIface *iface)
{
- iface->add = gtk_frame_buildable_add;
+ iface->add_child = gtk_frame_buildable_add_child;
}
static void
-gtk_frame_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_frame_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
if (type && strcmp (type, "label") == 0)
gtk_frame_set_label_widget (GTK_FRAME (buildable), GTK_WIDGET (child));
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index ea7a1933b0..96e09eb33a 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -916,7 +916,7 @@ static void
gtk_icon_view_buildable_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
- iface->add = _gtk_cell_layout_buildable_add;
+ iface->add_child = _gtk_cell_layout_buildable_add_child;
iface->custom_tag_start = gtk_icon_view_buildable_custom_tag_start;
iface->custom_tag_end = gtk_icon_view_buildable_custom_tag_end;
}
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 4297456f1f..48011b564a 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -425,7 +425,7 @@ static void do_detach_tab (GtkNotebook *from,
/* GtkBuildable */
static void gtk_notebook_buildable_init (GtkBuildableIface *iface);
-static void gtk_notebook_buildable_add (GtkBuildable *buildable,
+static void gtk_notebook_buildable_add_child (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *type);
@@ -1108,14 +1108,14 @@ gtk_notebook_init (GtkNotebook *notebook)
static void
gtk_notebook_buildable_init (GtkBuildableIface *iface)
{
- iface->add = gtk_notebook_buildable_add;
+ iface->add_child = gtk_notebook_buildable_add_child;
}
static void
-gtk_notebook_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_notebook_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
GtkNotebook *notebook = GTK_NOTEBOOK (buildable);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c1c7a6113f..28df174656 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -462,11 +462,11 @@ static GtkTreeViewColumn *gtk_tree_view_get_drop_column (GtkTreeView *tree
gint drop_position);
/* GtkBuildable */
-static void gtk_tree_view_buildable_add (GtkBuildable *tree_view,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type);
-static void gtk_tree_view_buildable_init (GtkBuildableIface *iface);
+static void gtk_tree_view_buildable_add_child (GtkBuildable *tree_view,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
+static void gtk_tree_view_buildable_init (GtkBuildableIface *iface);
static gboolean scroll_row_timeout (gpointer data);
@@ -1295,7 +1295,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
static void
gtk_tree_view_buildable_init (GtkBuildableIface *iface)
{
- iface->add = gtk_tree_view_buildable_add;
+ iface->add_child = gtk_tree_view_buildable_add_child;
}
static void
@@ -1507,10 +1507,10 @@ gtk_tree_view_finalize (GObject *object)
static void
-gtk_tree_view_buildable_add (GtkBuildable *tree_view,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_tree_view_buildable_add_child (GtkBuildable *tree_view,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), GTK_TREE_VIEW_COLUMN (child));
}
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 86be0371b7..2a352d9d4a 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -331,7 +331,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
static void
gtk_tree_view_column_buildable_init (GtkBuildableIface *iface)
{
- iface->add = _gtk_cell_layout_buildable_add;
+ iface->add_child = _gtk_cell_layout_buildable_add_child;
iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
iface->custom_tag_end = _gtk_cell_layout_buildable_custom_tag_end;
}
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index deaaf76ffd..3e0ac69be6 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -144,11 +144,11 @@ static void node_remove_ui_reference (GNode *node,
guint merge_id);
/* GtkBuildable */
-static void gtk_ui_manager_buildable_init (GtkBuildableIface *iface);
-static void gtk_ui_manager_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type);
+static void gtk_ui_manager_buildable_init (GtkBuildableIface *iface);
+static void gtk_ui_manager_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
static GObject* gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
GtkBuilder *builder,
const gchar *name);
@@ -428,17 +428,17 @@ gtk_ui_manager_finalize (GObject *object)
static void
gtk_ui_manager_buildable_init (GtkBuildableIface *iface)
{
- iface->add = gtk_ui_manager_buildable_add;
+ iface->add_child = gtk_ui_manager_buildable_add_child;
iface->construct_child = gtk_ui_manager_buildable_construct_child;
iface->custom_tag_start = gtk_ui_manager_buildable_custom_tag_start;
iface->custom_tag_end = gtk_ui_manager_buildable_custom_tag_end;
}
static void
-gtk_ui_manager_buildable_add (GtkBuildable *buildable,
- GtkBuilder *builder,
- GObject *child,
- const gchar *type)
+gtk_ui_manager_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
GtkUIManager *self = GTK_UI_MANAGER (buildable);
guint pos;
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,
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 654ed152cb..9b55757639 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -324,10 +324,10 @@ static void gtk_window_get_property (GObject *object,
/* GtkBuildable */
static void gtk_window_buildable_interface_init (GtkBuildableIface *iface);
-static void gtk_window_buildable_set_property (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name,
- const GValue *value);
+static void gtk_window_buildable_set_buildable_property (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name,
+ const GValue *value);
static void gtk_window_buildable_parser_finished (GtkBuildable *buildable,
GtkBuilder *builder);
@@ -1133,23 +1133,23 @@ static void
gtk_window_buildable_interface_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
- iface->set_property = gtk_window_buildable_set_property;
+ iface->set_buildable_property = gtk_window_buildable_set_buildable_property;
iface->parser_finished = gtk_window_buildable_parser_finished;
}
static void
-gtk_window_buildable_set_property (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *name,
- const GValue *value)
+gtk_window_buildable_set_buildable_property (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name,
+ const GValue *value)
{
GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (buildable);
if (strcmp (name, "visible") == 0 && g_value_get_boolean (value))
priv->builder_visible = TRUE;
else
- parent_buildable_iface->set_property (buildable, builder, name, value);
+ parent_buildable_iface->set_buildable_property (buildable, builder, name, value);
}
static void
View Lorry Controller Status