[gedit] Fix for gtk+ template api break

From: Ignacio Casal Quinteiro <icq src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit] Fix for gtk+ template api break
Date: Fri, 26 Jul 2013 16:00:20 +0000 (UTC)
commit 6c23e7ac3c0e592038ab444b11666aec957a73b5
Author: Ignacio Casal Quinteiro <ignacio casal nice-software com>
Date:   Fri Jul 26 18:00:01 2013 +0200

    Fix for gtk+ template api break

 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 d4f206f..ef79d4e 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, GeditEncodingsDialogPrivate, add_button);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, remove_button);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, available_treeview);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, available_liststore);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, sort_available);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, displayed_treeview);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, displayed_liststore);
-       gtk_widget_class_bind_child (widget_class, GeditEncodingsDialogPrivate, sort_displayed);
+       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);
 
        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 064eb16..789ec79 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, GeditHighlightModeDialogPrivate, treeview);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialogPrivate, entry);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialogPrivate, liststore);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialogPrivate, treemodelfilter);
-       gtk_widget_class_bind_child (widget_class, GeditHighlightModeDialogPrivate, treeview_selection);
+       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);
 
        g_type_class_add_private (object_class, sizeof (GeditHighlightModeDialogPrivate));
 }
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index 9969d6d..ab64f20 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, GeditPreferencesDialogPrivate, notebook);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, 
display_line_numbers_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, right_margin_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, right_margin_position_grid);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, 
right_margin_position_spinbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, 
highlight_current_line_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, 
bracket_matching_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, wrap_text_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, split_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, tabs_width_spinbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, insert_spaces_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, auto_indent_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, backup_copy_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, auto_save_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, auto_save_spinbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, default_font_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, font_button);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, font_grid);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, schemes_treeview_model);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, schemes_treeview);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, schemes_column);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, schemes_renderer);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, schemes_scrolled_window);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, install_scheme_button);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, uninstall_scheme_button);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, schemes_toolbar);
-       gtk_widget_class_bind_child (widget_class, GeditPreferencesDialogPrivate, 
plugin_manager_place_holder);
+       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);
 
        g_type_class_add_private (object_class, sizeof (GeditPreferencesDialogPrivate));
 }
diff --git a/gedit/gedit-print-preview.c b/gedit/gedit-print-preview.c
index 9b0596d..0628cff 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, GeditPrintPreviewPrivate, prev);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, next);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, multi);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, page_entry);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, last);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, zoom_one);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, zoom_fit);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, zoom_in);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, zoom_out);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, close);
-       gtk_widget_class_bind_child (widget_class, GeditPrintPreviewPrivate, layout);
+       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);
 
        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 20091f9..1492066 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, GeditProgressInfoBarPrivate, image);
-       gtk_widget_class_bind_child (widget_class, GeditProgressInfoBarPrivate, label);
-       gtk_widget_class_bind_child (widget_class, GeditProgressInfoBarPrivate, progress);
+       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);
 
        g_type_class_add_private (gobject_class, sizeof (GeditProgressInfoBarPrivate));
 }
diff --git a/gedit/gedit-replace-dialog.c b/gedit/gedit-replace-dialog.c
index 09506ed..f41bd7c 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, GeditReplaceDialogPrivate, grid);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialogPrivate, search_label);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialogPrivate, replace_label);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialogPrivate, match_case_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialogPrivate, entire_word_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialogPrivate, backwards_checkbutton);
-       gtk_widget_class_bind_child (widget_class, GeditReplaceDialogPrivate, wrap_around_checkbutton);
+       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);
 
        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 8478147..c0cfa60 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, GeditStatusMenuButtonPrivate, label);
+       gtk_widget_class_bind_child (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 9341b5f..06d487d 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, GeditViewFramePrivate, view);
-       gtk_widget_class_bind_child (widget_class, GeditViewFramePrivate, slider);
-       gtk_widget_class_bind_child (widget_class, GeditViewFramePrivate, search_entry);
-       gtk_widget_class_bind_child (widget_class, GeditViewFramePrivate, go_up_button);
-       gtk_widget_class_bind_child (widget_class, GeditViewFramePrivate, go_down_button);
+       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);
 
        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 06a5d3f..d428bc8 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, GeditFileBrowserWidgetPrivate, previous_button);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, next_button);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, combo);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, combo_model);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, location_entry);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, treeview);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, filter_entry);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, location_previous_menu);
-       gtk_widget_class_bind_child (widget_class, GeditFileBrowserWidgetPrivate, location_next_menu);
+       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);
 
        g_type_class_add_private (object_class,
                                  sizeof (GeditFileBrowserWidgetPrivate));
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]