diff options
author | Colin Walters <walters@verbum.org> | 2013-07-27 09:28:11 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2013-07-27 09:28:11 -0400 |
commit | e42648eb11eba71983347d82b1dc73337ee99af9 (patch) | |
tree | 9254981d6ee1e398b94356991d2f6806b42c0d04 | |
parent | 58a8879a7fe516e099d0fe701e7c7911e2e62804 (diff) | |
download | glade-e42648eb11eba71983347d82b1dc73337ee99af9.tar.gz |
Fix up previous patch to build
It wasn't complete.
30 files changed, 150 insertions, 150 deletions
diff --git a/plugins/gtk+/glade-about-dialog-editor.c b/plugins/gtk+/glade-about-dialog-editor.c index 3a535397..4e514858 100644 --- a/plugins/gtk+/glade-about-dialog-editor.c +++ b/plugins/gtk+/glade-about-dialog-editor.c @@ -64,16 +64,16 @@ glade_about_dialog_editor_class_init (GladeAboutDialogEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-about-dialog-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeAboutDialogEditorPrivate, license_label); - gtk_widget_class_bind_child (widget_class, GladeAboutDialogEditorPrivate, license_editor); - gtk_widget_class_bind_child (widget_class, GladeAboutDialogEditorPrivate, wrap_license_editor); - gtk_widget_class_bind_child (widget_class, GladeAboutDialogEditorPrivate, logo_file_radio); - gtk_widget_class_bind_child (widget_class, GladeAboutDialogEditorPrivate, logo_icon_radio); - - gtk_widget_class_bind_callback (widget_class, license_type_pre_commit); - gtk_widget_class_bind_callback (widget_class, license_type_post_commit); - gtk_widget_class_bind_callback (widget_class, logo_file_toggled); - gtk_widget_class_bind_callback (widget_class, logo_icon_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, license_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, license_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, wrap_license_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, logo_file_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeAboutDialogEditor, logo_icon_radio); + + gtk_widget_class_bind_template_callback (widget_class, license_type_pre_commit); + gtk_widget_class_bind_template_callback (widget_class, license_type_post_commit); + gtk_widget_class_bind_template_callback (widget_class, logo_file_toggled); + gtk_widget_class_bind_template_callback (widget_class, logo_icon_toggled); g_type_class_add_private (object_class, sizeof (GladeAboutDialogEditorPrivate)); } diff --git a/plugins/gtk+/glade-action-editor.c b/plugins/gtk+/glade-action-editor.c index 41ee87f7..b35229b2 100644 --- a/plugins/gtk+/glade-action-editor.c +++ b/plugins/gtk+/glade-action-editor.c @@ -57,15 +57,15 @@ glade_action_editor_class_init (GladeActionEditorClass * klass) widget_class->grab_focus = glade_action_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-action-editor.ui"); - gtk_widget_class_bind_child_internal (widget_class, GladeActionEditorPrivate, extension_port); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, toggle_title); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, radio_proxy_editor); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, toggle_active_editor); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, radio_group_label); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, radio_group_editor); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, radio_value_label); - gtk_widget_class_bind_child (widget_class, GladeActionEditorPrivate, radio_value_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, extension_port); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, toggle_title); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, radio_proxy_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, toggle_active_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, radio_group_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, radio_group_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, radio_value_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeActionEditor, radio_value_editor); g_type_class_add_private (object_class, sizeof (GladeActionEditorPrivate)); } diff --git a/plugins/gtk+/glade-activatable-editor.c b/plugins/gtk+/glade-activatable-editor.c index 8f843090..af7a546f 100644 --- a/plugins/gtk+/glade-activatable-editor.c +++ b/plugins/gtk+/glade-activatable-editor.c @@ -50,9 +50,9 @@ glade_activatable_editor_class_init (GladeActivatableEditorClass * klass) widget_class->grab_focus = glade_activatable_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-activatable-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeActivatableEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeActivatableEditorPrivate, action_name_label); - gtk_widget_class_bind_child (widget_class, GladeActivatableEditorPrivate, action_name_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeActivatableEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeActivatableEditor, action_name_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeActivatableEditor, action_name_editor); g_type_class_add_private (object_class, sizeof (GladeActivatableEditorPrivate)); diff --git a/plugins/gtk+/glade-app-chooser-button-editor.c b/plugins/gtk+/glade-app-chooser-button-editor.c index 5964bf76..3f134127 100644 --- a/plugins/gtk+/glade-app-chooser-button-editor.c +++ b/plugins/gtk+/glade-app-chooser-button-editor.c @@ -43,7 +43,7 @@ glade_app_chooser_button_editor_class_init (GladeAppChooserButtonEditorClass * k widget_class->grab_focus = glade_app_chooser_button_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-app-chooser-button-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeAppChooserButtonEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeAppChooserButtonEditor, embed); g_type_class_add_private (object_class, sizeof (GladeAppChooserButtonEditorPrivate)); } diff --git a/plugins/gtk+/glade-app-chooser-widget-editor.c b/plugins/gtk+/glade-app-chooser-widget-editor.c index b1daeb7a..571a2baa 100644 --- a/plugins/gtk+/glade-app-chooser-widget-editor.c +++ b/plugins/gtk+/glade-app-chooser-widget-editor.c @@ -43,7 +43,7 @@ glade_app_chooser_widget_editor_class_init (GladeAppChooserWidgetEditorClass * k widget_class->grab_focus = glade_app_chooser_widget_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-app-chooser-widget-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeAppChooserWidgetEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeAppChooserWidgetEditor, embed); g_type_class_add_private (object_class, sizeof (GladeAppChooserWidgetEditorPrivate)); } diff --git a/plugins/gtk+/glade-arrow-editor.c b/plugins/gtk+/glade-arrow-editor.c index a34455b0..9cf93e48 100644 --- a/plugins/gtk+/glade-arrow-editor.c +++ b/plugins/gtk+/glade-arrow-editor.c @@ -45,7 +45,7 @@ glade_arrow_editor_class_init (GladeArrowEditorClass * klass) widget_class->grab_focus = glade_arrow_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-arrow-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeArrowEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeArrowEditor, embed); g_type_class_add_private (object_class, sizeof (GladeArrowEditorPrivate)); } diff --git a/plugins/gtk+/glade-box-editor.c b/plugins/gtk+/glade-box-editor.c index 9d1a832c..40898dc3 100644 --- a/plugins/gtk+/glade-box-editor.c +++ b/plugins/gtk+/glade-box-editor.c @@ -44,7 +44,7 @@ glade_box_editor_class_init (GladeBoxEditorClass * klass) widget_class->grab_focus = glade_box_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-box-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeBoxEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeBoxEditor, embed); g_type_class_add_private (object_class, sizeof (GladeBoxEditorPrivate)); } diff --git a/plugins/gtk+/glade-button-editor.c b/plugins/gtk+/glade-button-editor.c index fde2f6ff..2ea55138 100644 --- a/plugins/gtk+/glade-button-editor.c +++ b/plugins/gtk+/glade-button-editor.c @@ -88,28 +88,28 @@ glade_button_editor_class_init (GladeButtonEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-button-editor.ui"); - gtk_widget_class_bind_child_internal (widget_class, GladeButtonEditorPrivate, extension_port); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, relief_label); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, relief_shell); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, response_label); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, response_shell); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, content_label); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, group_shell); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, group_label); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, active_shell); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, inconsistent_shell); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, draw_indicator_shell); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, custom_check); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, stock_radio); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, label_radio); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, standard_frame); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, stock_frame); - gtk_widget_class_bind_child (widget_class, GladeButtonEditorPrivate, label_frame); - - gtk_widget_class_bind_callback (widget_class, custom_toggled); - gtk_widget_class_bind_callback (widget_class, stock_toggled); - gtk_widget_class_bind_callback (widget_class, label_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, extension_port); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, relief_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, relief_shell); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, response_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, response_shell); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, content_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, group_shell); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, group_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, active_shell); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, inconsistent_shell); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, draw_indicator_shell); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, custom_check); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, stock_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, label_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, standard_frame); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, stock_frame); + gtk_widget_class_bind_template_child_private (widget_class, GladeButtonEditor, label_frame); + + gtk_widget_class_bind_template_callback (widget_class, custom_toggled); + gtk_widget_class_bind_template_callback (widget_class, stock_toggled); + gtk_widget_class_bind_template_callback (widget_class, label_toggled); g_type_class_add_private (object_class, sizeof (GladeButtonEditorPrivate)); } diff --git a/plugins/gtk+/glade-combo-box-editor.c b/plugins/gtk+/glade-combo-box-editor.c index 86a5a46f..e173052c 100644 --- a/plugins/gtk+/glade-combo-box-editor.c +++ b/plugins/gtk+/glade-combo-box-editor.c @@ -43,7 +43,7 @@ glade_combo_box_editor_class_init (GladeComboBoxEditorClass * klass) widget_class->grab_focus = glade_combo_box_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-combo-box-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeComboBoxEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeComboBoxEditor, embed); g_type_class_add_private (object_class, sizeof (GladeComboBoxEditorPrivate)); } diff --git a/plugins/gtk+/glade-combo-box-text-editor.c b/plugins/gtk+/glade-combo-box-text-editor.c index 368c56e9..126d8cd8 100644 --- a/plugins/gtk+/glade-combo-box-text-editor.c +++ b/plugins/gtk+/glade-combo-box-text-editor.c @@ -43,7 +43,7 @@ glade_combo_box_text_editor_class_init (GladeComboBoxTextEditorClass * klass) widget_class->grab_focus = glade_combo_box_text_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-combo-box-text-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeComboBoxTextEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeComboBoxTextEditor, embed); g_type_class_add_private (object_class, sizeof (GladeComboBoxTextEditorPrivate)); } diff --git a/plugins/gtk+/glade-entry-editor.c b/plugins/gtk+/glade-entry-editor.c index 79b07db1..784155d2 100644 --- a/plugins/gtk+/glade-entry-editor.c +++ b/plugins/gtk+/glade-entry-editor.c @@ -94,33 +94,33 @@ glade_entry_editor_class_init (GladeEntryEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-entry-editor.ui"); - gtk_widget_class_bind_child_internal (widget_class, GladeEntryEditorPrivate, extension_port); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, text_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, buffer_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, primary_stock_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, primary_icon_name_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, primary_pixbuf_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, primary_tooltip_markup_check); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, primary_tooltip_notebook); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, primary_tooltip_editor_notebook); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, secondary_stock_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, secondary_icon_name_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, secondary_pixbuf_radio); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, secondary_tooltip_markup_check); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, secondary_tooltip_notebook); - gtk_widget_class_bind_child (widget_class, GladeEntryEditorPrivate, secondary_tooltip_editor_notebook); - - gtk_widget_class_bind_callback (widget_class, text_toggled); - gtk_widget_class_bind_callback (widget_class, buffer_toggled); - gtk_widget_class_bind_callback (widget_class, primary_stock_toggled); - gtk_widget_class_bind_callback (widget_class, primary_icon_name_toggled); - gtk_widget_class_bind_callback (widget_class, primary_pixbuf_toggled); - gtk_widget_class_bind_callback (widget_class, primary_tooltip_markup_toggled); - gtk_widget_class_bind_callback (widget_class, secondary_stock_toggled); - gtk_widget_class_bind_callback (widget_class, secondary_icon_name_toggled); - gtk_widget_class_bind_callback (widget_class, secondary_pixbuf_toggled); - gtk_widget_class_bind_callback (widget_class, secondary_tooltip_markup_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, extension_port); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, text_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, buffer_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, primary_stock_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, primary_icon_name_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, primary_pixbuf_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, primary_tooltip_markup_check); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, primary_tooltip_notebook); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, primary_tooltip_editor_notebook); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, secondary_stock_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, secondary_icon_name_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, secondary_pixbuf_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, secondary_tooltip_markup_check); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, secondary_tooltip_notebook); + gtk_widget_class_bind_template_child_private (widget_class, GladeEntryEditor, secondary_tooltip_editor_notebook); + + gtk_widget_class_bind_template_callback (widget_class, text_toggled); + gtk_widget_class_bind_template_callback (widget_class, buffer_toggled); + gtk_widget_class_bind_template_callback (widget_class, primary_stock_toggled); + gtk_widget_class_bind_template_callback (widget_class, primary_icon_name_toggled); + gtk_widget_class_bind_template_callback (widget_class, primary_pixbuf_toggled); + gtk_widget_class_bind_template_callback (widget_class, primary_tooltip_markup_toggled); + gtk_widget_class_bind_template_callback (widget_class, secondary_stock_toggled); + gtk_widget_class_bind_template_callback (widget_class, secondary_icon_name_toggled); + gtk_widget_class_bind_template_callback (widget_class, secondary_pixbuf_toggled); + gtk_widget_class_bind_template_callback (widget_class, secondary_tooltip_markup_toggled); g_type_class_add_private (object_class, sizeof (GladeEntryEditorPrivate)); } diff --git a/plugins/gtk+/glade-grid-editor.c b/plugins/gtk+/glade-grid-editor.c index a2d105b7..f8f848a1 100644 --- a/plugins/gtk+/glade-grid-editor.c +++ b/plugins/gtk+/glade-grid-editor.c @@ -44,7 +44,7 @@ glade_grid_editor_class_init (GladeGridEditorClass * klass) widget_class->grab_focus = glade_grid_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-grid-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeGridEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeGridEditor, embed); g_type_class_add_private (object_class, sizeof (GladeGridEditorPrivate)); } diff --git a/plugins/gtk+/glade-icon-view-editor.c b/plugins/gtk+/glade-icon-view-editor.c index 3aa2c363..bab5ebed 100644 --- a/plugins/gtk+/glade-icon-view-editor.c +++ b/plugins/gtk+/glade-icon-view-editor.c @@ -44,7 +44,7 @@ glade_icon_view_editor_class_init (GladeIconViewEditorClass * klass) widget_class->grab_focus = glade_icon_view_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-icon-view-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeIconViewEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeIconViewEditor, embed); g_type_class_add_private (object_class, sizeof (GladeIconViewEditorPrivate)); } diff --git a/plugins/gtk+/glade-image-editor.c b/plugins/gtk+/glade-image-editor.c index 7ce2077a..1798bcca 100644 --- a/plugins/gtk+/glade-image-editor.c +++ b/plugins/gtk+/glade-image-editor.c @@ -60,16 +60,16 @@ glade_image_editor_class_init (GladeImageEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-image-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeImageEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeImageEditorPrivate, stock_radio); - gtk_widget_class_bind_child (widget_class, GladeImageEditorPrivate, icon_radio); - gtk_widget_class_bind_child (widget_class, GladeImageEditorPrivate, resource_radio); - gtk_widget_class_bind_child (widget_class, GladeImageEditorPrivate, file_radio); - - gtk_widget_class_bind_callback (widget_class, stock_toggled); - gtk_widget_class_bind_callback (widget_class, icon_toggled); - gtk_widget_class_bind_callback (widget_class, resource_toggled); - gtk_widget_class_bind_callback (widget_class, file_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeImageEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeImageEditor, stock_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeImageEditor, icon_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeImageEditor, resource_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeImageEditor, file_radio); + + gtk_widget_class_bind_template_callback (widget_class, stock_toggled); + gtk_widget_class_bind_template_callback (widget_class, icon_toggled); + gtk_widget_class_bind_template_callback (widget_class, resource_toggled); + gtk_widget_class_bind_template_callback (widget_class, file_toggled); g_type_class_add_private (object_class, sizeof (GladeImageEditorPrivate)); } diff --git a/plugins/gtk+/glade-label-editor.c b/plugins/gtk+/glade-label-editor.c index 7c0cc9dd..23ff249f 100644 --- a/plugins/gtk+/glade-label-editor.c +++ b/plugins/gtk+/glade-label-editor.c @@ -74,21 +74,21 @@ glade_label_editor_class_init (GladeLabelEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-label-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, attributes_radio); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, markup_radio); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, pattern_radio); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, wrap_free_label); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, wrap_free_radio); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, single_radio); - gtk_widget_class_bind_child (widget_class, GladeLabelEditorPrivate, wrap_mode_radio); - - gtk_widget_class_bind_callback (widget_class, attributes_toggled); - gtk_widget_class_bind_callback (widget_class, markup_toggled); - gtk_widget_class_bind_callback (widget_class, pattern_toggled); - gtk_widget_class_bind_callback (widget_class, wrap_free_toggled); - gtk_widget_class_bind_callback (widget_class, single_toggled); - gtk_widget_class_bind_callback (widget_class, wrap_mode_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, attributes_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, markup_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, pattern_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, wrap_free_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, wrap_free_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, single_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeLabelEditor, wrap_mode_radio); + + gtk_widget_class_bind_template_callback (widget_class, attributes_toggled); + gtk_widget_class_bind_template_callback (widget_class, markup_toggled); + gtk_widget_class_bind_template_callback (widget_class, pattern_toggled); + gtk_widget_class_bind_template_callback (widget_class, wrap_free_toggled); + gtk_widget_class_bind_template_callback (widget_class, single_toggled); + gtk_widget_class_bind_template_callback (widget_class, wrap_mode_toggled); g_type_class_add_private (object_class, sizeof (GladeLabelEditorPrivate)); } diff --git a/plugins/gtk+/glade-layout-editor.c b/plugins/gtk+/glade-layout-editor.c index 509d64f6..8d59698d 100644 --- a/plugins/gtk+/glade-layout-editor.c +++ b/plugins/gtk+/glade-layout-editor.c @@ -44,7 +44,7 @@ glade_layout_editor_class_init (GladeLayoutEditorClass * klass) widget_class->grab_focus = glade_layout_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-layout-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeLayoutEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeLayoutEditor, embed); g_type_class_add_private (object_class, sizeof (GladeLayoutEditorPrivate)); } diff --git a/plugins/gtk+/glade-level-bar-editor.c b/plugins/gtk+/glade-level-bar-editor.c index c18ea632..e6752d2d 100644 --- a/plugins/gtk+/glade-level-bar-editor.c +++ b/plugins/gtk+/glade-level-bar-editor.c @@ -43,7 +43,7 @@ glade_level_bar_editor_class_init (GladeLevelBarEditorClass * klass) widget_class->grab_focus = glade_level_bar_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-level-bar-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeLevelBarEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeLevelBarEditor, embed); g_type_class_add_private (object_class, sizeof (GladeLevelBarEditorPrivate)); } diff --git a/plugins/gtk+/glade-notebook-editor.c b/plugins/gtk+/glade-notebook-editor.c index 516bec74..e2ecec0a 100644 --- a/plugins/gtk+/glade-notebook-editor.c +++ b/plugins/gtk+/glade-notebook-editor.c @@ -50,8 +50,8 @@ glade_notebook_editor_class_init (GladeNotebookEditorClass * klass) widget_class->grab_focus = glade_notebook_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-notebook-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeNotebookEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeNotebookEditorPrivate, tabs_grid); + gtk_widget_class_bind_template_child_private (widget_class, GladeNotebookEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeNotebookEditor, tabs_grid); g_type_class_add_private (object_class, sizeof (GladeNotebookEditorPrivate)); } diff --git a/plugins/gtk+/glade-progress-bar-editor.c b/plugins/gtk+/glade-progress-bar-editor.c index 94bf395b..fba589ee 100644 --- a/plugins/gtk+/glade-progress-bar-editor.c +++ b/plugins/gtk+/glade-progress-bar-editor.c @@ -43,7 +43,7 @@ glade_progress_bar_editor_class_init (GladeProgressBarEditorClass * klass) widget_class->grab_focus = glade_progress_bar_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-progress-bar-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeProgressBarEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeProgressBarEditor, embed); g_type_class_add_private (object_class, sizeof (GladeProgressBarEditorPrivate)); } diff --git a/plugins/gtk+/glade-real-tree-view-editor.c b/plugins/gtk+/glade-real-tree-view-editor.c index 554d57a7..12542a24 100644 --- a/plugins/gtk+/glade-real-tree-view-editor.c +++ b/plugins/gtk+/glade-real-tree-view-editor.c @@ -44,7 +44,7 @@ glade_real_tree_view_editor_class_init (GladeRealTreeViewEditorClass * klass) widget_class->grab_focus = glade_real_tree_view_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-real-tree-view-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeRealTreeViewEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeRealTreeViewEditor, embed); g_type_class_add_private (object_class, sizeof (GladeRealTreeViewEditorPrivate)); } diff --git a/plugins/gtk+/glade-recent-chooser-editor.c b/plugins/gtk+/glade-recent-chooser-editor.c index 65fe9882..7bf0f9c6 100644 --- a/plugins/gtk+/glade-recent-chooser-editor.c +++ b/plugins/gtk+/glade-recent-chooser-editor.c @@ -46,8 +46,8 @@ glade_recent_chooser_editor_class_init (GladeRecentChooserEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-recent-chooser-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeRecentChooserEditorPrivate, select_multiple_editor); - gtk_widget_class_bind_child (widget_class, GladeRecentChooserEditorPrivate, show_numbers_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeRecentChooserEditor, select_multiple_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeRecentChooserEditor, show_numbers_editor); g_type_class_add_private (object_class, sizeof (GladeRecentChooserEditorPrivate)); } diff --git a/plugins/gtk+/glade-scale-editor.c b/plugins/gtk+/glade-scale-editor.c index a3d2b0d5..fee57b0c 100644 --- a/plugins/gtk+/glade-scale-editor.c +++ b/plugins/gtk+/glade-scale-editor.c @@ -44,7 +44,7 @@ glade_scale_editor_class_init (GladeScaleEditorClass * klass) widget_class->grab_focus = glade_scale_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-scale-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeScaleEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeScaleEditor, embed); g_type_class_add_private (object_class, sizeof (GladeScaleEditorPrivate)); } diff --git a/plugins/gtk+/glade-scrollbar-editor.c b/plugins/gtk+/glade-scrollbar-editor.c index 17f74085..d6993ed4 100644 --- a/plugins/gtk+/glade-scrollbar-editor.c +++ b/plugins/gtk+/glade-scrollbar-editor.c @@ -44,7 +44,7 @@ glade_scrollbar_editor_class_init (GladeScrollbarEditorClass * klass) widget_class->grab_focus = glade_scrollbar_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-scrollbar-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeScrollbarEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeScrollbarEditor, embed); g_type_class_add_private (object_class, sizeof (GladeScrollbarEditorPrivate)); } diff --git a/plugins/gtk+/glade-scrolled-window-editor.c b/plugins/gtk+/glade-scrolled-window-editor.c index 38b74d4f..c5ccb414 100644 --- a/plugins/gtk+/glade-scrolled-window-editor.c +++ b/plugins/gtk+/glade-scrolled-window-editor.c @@ -43,7 +43,7 @@ glade_scrolled_window_editor_class_init (GladeScrolledWindowEditorClass * klass) widget_class->grab_focus = glade_scrolled_window_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-scrolled-window-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeScrolledWindowEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeScrolledWindowEditor, embed); g_type_class_add_private (object_class, sizeof (GladeScrolledWindowEditorPrivate)); } diff --git a/plugins/gtk+/glade-text-view-editor.c b/plugins/gtk+/glade-text-view-editor.c index 78861312..20b55f51 100644 --- a/plugins/gtk+/glade-text-view-editor.c +++ b/plugins/gtk+/glade-text-view-editor.c @@ -43,7 +43,7 @@ glade_text_view_editor_class_init (GladeTextViewEditorClass * klass) widget_class->grab_focus = glade_text_view_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-text-view-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeTextViewEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeTextViewEditor, embed); g_type_class_add_private (object_class, sizeof (GladeTextViewEditorPrivate)); } diff --git a/plugins/gtk+/glade-tool-button-editor.c b/plugins/gtk+/glade-tool-button-editor.c index b4fe3821..b3e8dc90 100644 --- a/plugins/gtk+/glade-tool-button-editor.c +++ b/plugins/gtk+/glade-tool-button-editor.c @@ -75,21 +75,21 @@ glade_tool_button_editor_class_init (GladeToolButtonEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-tool-button-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, standard_label_radio); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, custom_label_radio); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, stock_radio); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, icon_radio); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, custom_radio); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, toggle_active_editor); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, radio_group_label); - gtk_widget_class_bind_child (widget_class, GladeToolButtonEditorPrivate, radio_group_editor); - - gtk_widget_class_bind_callback (widget_class, standard_label_toggled); - gtk_widget_class_bind_callback (widget_class, custom_label_toggled); - gtk_widget_class_bind_callback (widget_class, stock_toggled); - gtk_widget_class_bind_callback (widget_class, icon_toggled); - gtk_widget_class_bind_callback (widget_class, custom_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, standard_label_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, custom_label_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, stock_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, icon_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, custom_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, toggle_active_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, radio_group_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolButtonEditor, radio_group_editor); + + gtk_widget_class_bind_template_callback (widget_class, standard_label_toggled); + gtk_widget_class_bind_template_callback (widget_class, custom_label_toggled); + gtk_widget_class_bind_template_callback (widget_class, stock_toggled); + gtk_widget_class_bind_template_callback (widget_class, icon_toggled); + gtk_widget_class_bind_template_callback (widget_class, custom_toggled); g_type_class_add_private (object_class, sizeof (GladeToolButtonEditorPrivate)); } diff --git a/plugins/gtk+/glade-tool-palette-editor.c b/plugins/gtk+/glade-tool-palette-editor.c index cb971618..41a8ddaf 100644 --- a/plugins/gtk+/glade-tool-palette-editor.c +++ b/plugins/gtk+/glade-tool-palette-editor.c @@ -43,7 +43,7 @@ glade_tool_palette_editor_class_init (GladeToolPaletteEditorClass * klass) widget_class->grab_focus = glade_tool_palette_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-tool-palette-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeToolPaletteEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeToolPaletteEditor, embed); g_type_class_add_private (object_class, sizeof (GladeToolPaletteEditorPrivate)); } diff --git a/plugins/gtk+/glade-viewport-editor.c b/plugins/gtk+/glade-viewport-editor.c index f4cc65d3..24ffcdbd 100644 --- a/plugins/gtk+/glade-viewport-editor.c +++ b/plugins/gtk+/glade-viewport-editor.c @@ -44,7 +44,7 @@ glade_viewport_editor_class_init (GladeViewportEditorClass * klass) widget_class->grab_focus = glade_viewport_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-viewport-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeViewportEditorPrivate, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeViewportEditor, embed); g_type_class_add_private (object_class, sizeof (GladeViewportEditorPrivate)); } diff --git a/plugins/gtk+/glade-widget-editor.c b/plugins/gtk+/glade-widget-editor.c index 851acc60..de4c38c6 100644 --- a/plugins/gtk+/glade-widget-editor.c +++ b/plugins/gtk+/glade-widget-editor.c @@ -67,17 +67,17 @@ glade_widget_editor_class_init (GladeWidgetEditorClass * klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-widget-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, custom_tooltip_check); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, tooltip_markup_check); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, tooltip_label_notebook); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, tooltip_editor_notebook); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, resize_mode_label); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, resize_mode_editor); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, border_width_label); - gtk_widget_class_bind_child (widget_class, GladeWidgetEditorPrivate, border_width_editor); - - gtk_widget_class_bind_callback (widget_class, markup_toggled); - gtk_widget_class_bind_callback (widget_class, custom_tooltip_toggled); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, custom_tooltip_check); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, tooltip_markup_check); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, tooltip_label_notebook); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, tooltip_editor_notebook); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, resize_mode_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, resize_mode_editor); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, border_width_label); + gtk_widget_class_bind_template_child_private (widget_class, GladeWidgetEditor, border_width_editor); + + gtk_widget_class_bind_template_callback (widget_class, markup_toggled); + gtk_widget_class_bind_template_callback (widget_class, custom_tooltip_toggled); g_type_class_add_private (object_class, sizeof (GladeWidgetEditorPrivate)); } diff --git a/plugins/gtk+/glade-window-editor.c b/plugins/gtk+/glade-window-editor.c index 80ea3b45..40e180fe 100644 --- a/plugins/gtk+/glade-window-editor.c +++ b/plugins/gtk+/glade-window-editor.c @@ -55,13 +55,13 @@ glade_window_editor_class_init (GladeWindowEditorClass * klass) widget_class->grab_focus = glade_window_editor_grab_focus; gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/gladegtk/glade-window-editor.ui"); - gtk_widget_class_bind_child (widget_class, GladeWindowEditorPrivate, embed); - gtk_widget_class_bind_child (widget_class, GladeWindowEditorPrivate, icon_name_radio); - gtk_widget_class_bind_child (widget_class, GladeWindowEditorPrivate, icon_file_radio); - gtk_widget_class_bind_child_internal (widget_class, GladeWindowEditorPrivate, extension_port); + gtk_widget_class_bind_template_child_private (widget_class, GladeWindowEditor, embed); + gtk_widget_class_bind_template_child_private (widget_class, GladeWindowEditor, icon_name_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeWindowEditor, icon_file_radio); + gtk_widget_class_bind_template_child_private (widget_class, GladeWindowEditor, extension_port); - gtk_widget_class_bind_callback (widget_class, icon_name_toggled); - gtk_widget_class_bind_callback (widget_class, icon_file_toggled); + gtk_widget_class_bind_template_callback (widget_class, icon_name_toggled); + gtk_widget_class_bind_template_callback (widget_class, icon_file_toggled); g_type_class_add_private (object_class, sizeof (GladeWindowEditorPrivate)); } |