Rename the widget template API

The macros and functions are inconsistently named, and are not tied to
the "template" concept - to the point that it seems plausible to use
them without setting the template.

The new naming scheme is as follows:

  gtk_widget_class_bind_template_child_full
  gtk_widget_class_bind_template_callback_full

With the convenience macros:

  gtk_widget_class_bind_template_child
  gtk_widget_class_bind_template_child_internal
  gtk_widget_class_bind_template_callback

https://bugzilla.gnome.org/show_bug.cgi?id=700898
https://bugzilla.gnome.org/show_bug.cgi?id=700896

1 files changed, 20 insertions, 20 deletions

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index f798e79ef5..5aea1380db 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -431,26 +431,26 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   gtk_widget_class_set_template_from_resource (widget_class,
 					       "/org/gtk/libgtk/gtkassistant.ui");
 
-  gtk_widget_class_bind_child_internal (widget_class, GtkAssistant, action_area);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, content);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, cancel);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, forward);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, back);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, apply);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, close);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, last);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, sidebar);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, button_size_group);
-  gtk_widget_class_bind_child (widget_class, GtkAssistant, title_size_group);
-
-  gtk_widget_class_bind_callback (widget_class, assistant_sidebar_draw_cb);
-  gtk_widget_class_bind_callback (widget_class, assistant_remove_page_cb);
-  gtk_widget_class_bind_callback (widget_class, on_assistant_close);
-  gtk_widget_class_bind_callback (widget_class, on_assistant_apply);
-  gtk_widget_class_bind_callback (widget_class, on_assistant_forward);
-  gtk_widget_class_bind_callback (widget_class, on_assistant_back);
-  gtk_widget_class_bind_callback (widget_class, on_assistant_cancel);
-  gtk_widget_class_bind_callback (widget_class, on_assistant_last);
+  gtk_widget_class_bind_template_child_internal (widget_class, GtkAssistant, action_area);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, content);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, cancel);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, forward);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, back);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, apply);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, close);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, last);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, sidebar);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, button_size_group);
+  gtk_widget_class_bind_template_child (widget_class, GtkAssistant, title_size_group);
+
+  gtk_widget_class_bind_template_callback (widget_class, assistant_sidebar_draw_cb);
+  gtk_widget_class_bind_template_callback (widget_class, assistant_remove_page_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_assistant_close);
+  gtk_widget_class_bind_template_callback (widget_class, on_assistant_apply);
+  gtk_widget_class_bind_template_callback (widget_class, on_assistant_forward);
+  gtk_widget_class_bind_template_callback (widget_class, on_assistant_back);
+  gtk_widget_class_bind_template_callback (widget_class, on_assistant_cancel);
+  gtk_widget_class_bind_template_callback (widget_class, on_assistant_last);
 }
 
 static gint