[gedit] Adapt to recent GTK+ api changes

[Colin Walters <walters src gnome org>]

commit 32f3b030511666c8000042242110b68245116920
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jul 26 20:26:24 2013 -0400

    Adapt to recent GTK+ api changes
    
    The template binding macros got renamed around a few times.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704963

 gedit/gedit-encodings-dialog.c                  |   16 +++---
 gedit/gedit-highlight-mode-dialog.c             |   10 ++--
 gedit/gedit-preferences-dialog.c                |   54 +++++++++++-----------
 gedit/gedit-print-preview.c                     |   22 +++++-----
 gedit/gedit-progress-info-bar.c                 |    6 +-
 gedit/gedit-replace-dialog.c                    |   14 +++---
 gedit/gedit-status-menu-button.c                |    2 +-
 gedit/gedit-view-frame.c                        |   10 ++--
 plugins/filebrowser/gedit-file-browser-widget.c |   18 ++++----
 9 files changed, 76 insertions(+), 76 deletions(-)
---
diff --git a/gedit/gedit-encodings-dialog.c b/gedit/gedit-encodings-dialog.c
index ef79d4e..7bc90e1 100644
--- a/gedit/gedit-encodings-dialog.c
+++ b/gedit/gedit-encodings-dialog.c
@@ -133,14 +133,14 @@ gedit_encodings_dialog_class_init (GeditEncodingsDialogClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-encodings-dialog.ui");
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, add_button);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, remove_button);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, available_treeview);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, available_liststore);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, sort_available);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, displayed_treeview);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, displayed_liststore);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialog, sort_displayed);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, add_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, remove_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, available_treeview);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
available_liststore);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, sort_available);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, displayed_treeview);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
displayed_liststore);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, sort_displayed);
 
        g_type_class_add_private (object_class, sizeof (GeditEncodingsDialogPrivate));
 }
diff --git a/gedit/gedit-highlight-mode-dialog.c b/gedit/gedit-highlight-mode-dialog.c
index 789ec79..919a46b 100644
--- a/gedit/gedit-highlight-mode-dialog.c
+++ b/gedit/gedit-highlight-mode-dialog.c
@@ -112,11 +112,11 @@ gedit_highlight_mode_dialog_class_init (GeditHighlightModeDialogClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-highlight-mode-dialog.ui");
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialog, treeview);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialog, entry);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialog, liststore);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialog, treemodelfilter);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialog, treeview_selection);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditHighlightModeDialog, treeview);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditHighlightModeDialog, entry);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditHighlightModeDialog, liststore);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditHighlightModeDialog, 
treemodelfilter);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditHighlightModeDialog, 
treeview_selection);
 
        g_type_class_add_private (object_class, sizeof (GeditHighlightModeDialogPrivate));
 }
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index ab64f20..74da971 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -177,33 +177,33 @@ gedit_preferences_dialog_class_init (GeditPreferencesDialogClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-preferences-dialog.ui");
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, notebook);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, display_line_numbers_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, right_margin_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, right_margin_position_grid);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, right_margin_position_spinbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, 
highlight_current_line_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, bracket_matching_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, wrap_text_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, split_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, tabs_width_spinbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, insert_spaces_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, auto_indent_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, backup_copy_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, auto_save_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, auto_save_spinbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, default_font_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, font_button);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, font_grid);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, schemes_treeview_model);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, schemes_treeview);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, schemes_column);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, schemes_renderer);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, schemes_scrolled_window);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, install_scheme_button);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, uninstall_scheme_button);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, schemes_toolbar);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialog, plugin_manager_place_holder);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, notebook);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
display_line_numbers_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
right_margin_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
right_margin_position_grid);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
right_margin_position_spinbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
highlight_current_line_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
bracket_matching_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
wrap_text_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
split_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
tabs_width_spinbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
insert_spaces_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
auto_indent_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
backup_copy_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
auto_save_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
auto_save_spinbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
default_font_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, font_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, font_grid);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
schemes_treeview_model);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, schemes_treeview);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, schemes_column);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, schemes_renderer);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
schemes_scrolled_window);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
install_scheme_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
uninstall_scheme_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, schemes_toolbar);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPreferencesDialog, 
plugin_manager_place_holder);
 
        g_type_class_add_private (object_class, sizeof (GeditPreferencesDialogPrivate));
 }
diff --git a/gedit/gedit-print-preview.c b/gedit/gedit-print-preview.c
index 0628cff..dd42791 100644
--- a/gedit/gedit-print-preview.c
+++ b/gedit/gedit-print-preview.c
@@ -152,17 +152,17 @@ gedit_print_preview_class_init (GeditPrintPreviewClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-print-preview.ui");
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, prev);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, next);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, multi);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, page_entry);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, last);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, zoom_one);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, zoom_fit);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, zoom_in);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, zoom_out);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, close);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreview, layout);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, prev);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, next);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, multi);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, page_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, last);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, zoom_one);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, zoom_fit);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, zoom_in);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, zoom_out);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, close);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditPrintPreview, layout);
 
        g_type_class_add_private (object_class, sizeof (GeditPrintPreviewPrivate));
 }
diff --git a/gedit/gedit-progress-info-bar.c b/gedit/gedit-progress-info-bar.c
index 1492066..1323767 100644
--- a/gedit/gedit-progress-info-bar.c
+++ b/gedit/gedit-progress-info-bar.c
@@ -100,9 +100,9 @@ gedit_progress_info_bar_class_init (GeditProgressInfoBarClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-progress-info-bar.ui");
-       gtk_widget_class_bind_child (widget_class, GeditProgressInfoBar, image);
-       gtk_widget_class_bind_child (widget_class, GeditProgressInfoBar, label);
-       gtk_widget_class_bind_child (widget_class, GeditProgressInfoBar, progress);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditProgressInfoBar, image);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditProgressInfoBar, label);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditProgressInfoBar, progress);
 
        g_type_class_add_private (gobject_class, sizeof (GeditProgressInfoBarPrivate));
 }
diff --git a/gedit/gedit-replace-dialog.c b/gedit/gedit-replace-dialog.c
index f41bd7c..165625c 100644
--- a/gedit/gedit-replace-dialog.c
+++ b/gedit/gedit-replace-dialog.c
@@ -125,13 +125,13 @@ gedit_replace_dialog_class_init (GeditReplaceDialogClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-replace-dialog.ui");
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, grid);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, search_label);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, replace_label);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, match_case_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, entire_word_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, backwards_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialog, wrap_around_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, grid);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, search_label);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, replace_label);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, 
match_case_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, 
entire_word_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, 
backwards_checkbutton);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditReplaceDialog, 
wrap_around_checkbutton);
 
        g_type_class_add_private (object_class, sizeof (GeditReplaceDialogPrivate));
 }
diff --git a/gedit/gedit-status-menu-button.c b/gedit/gedit-status-menu-button.c
index c0cfa60..f8e59ff 100644
--- a/gedit/gedit-status-menu-button.c
+++ b/gedit/gedit-status-menu-button.c
@@ -110,7 +110,7 @@ gedit_status_menu_button_class_init (GeditStatusMenuButtonClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-status-menu-button.ui");
-       gtk_widget_class_bind_child (widget_class, GeditStatusMenuButton, label);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditStatusMenuButton, label);
 
        g_type_class_add_private (object_class, sizeof (GeditStatusMenuButtonPrivate));
 
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 06d487d..7b06037 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -1347,11 +1347,11 @@ gedit_view_frame_class_init (GeditViewFrameClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-view-frame.ui");
-       gtk_widget_class_bind_child (widget_class, GeditViewFrame, view);
-       gtk_widget_class_bind_child (widget_class, GeditViewFrame, slider);
-       gtk_widget_class_bind_child (widget_class, GeditViewFrame, search_entry);
-       gtk_widget_class_bind_child (widget_class, GeditViewFrame, go_up_button);
-       gtk_widget_class_bind_child (widget_class, GeditViewFrame, go_down_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, view);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, slider);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, search_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, go_up_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, go_down_button);
 
        g_type_class_add_private (object_class, sizeof (GeditViewFramePrivate));
 }
diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c
index d428bc8..ec4bcd1 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@@ -556,15 +556,15 @@ gedit_file_browser_widget_class_init (GeditFileBrowserWidgetClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     
"/org/gnome/gedit/plugins/file-browser/ui/gedit-file-browser-widget.ui");
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, previous_button);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, next_button);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, combo);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, combo_model);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, location_entry);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, treeview);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, filter_entry);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, location_previous_menu);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidget, location_next_menu);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, previous_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, next_button);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, combo);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, combo_model);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, location_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, treeview);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, filter_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, 
location_previous_menu);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, 
location_next_menu);
 
        g_type_class_add_private (object_class,
                                  sizeof (GeditFileBrowserWidgetPrivate));