summaryrefslogtreecommitdiff
path: root/gtk/gtkuimanager.c
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@async.com.br>2007-06-19 12:23:36 +0000
committerJohan Dahlin <johan@src.gnome.org>2007-06-19 12:23:36 +0000
commit60a409785facbef5ba61c0bb1e396ec027e02bbc (patch)
treeddcf183272d6352f3f57b8e13ddcb0ede4c885f9 /gtk/gtkuimanager.c
parent2e654b1671ea5451cc1ca8ed8a03380e2b175f7e (diff)
downloadgtk+-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/gtkuimanager.c')
-rw-r--r--gtk/gtkuimanager.c20
1 files changed, 10 insertions, 10 deletions
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;