widget: Use a real offset in gtk_widget_class_automate_child

Using an offset from the struct means you can have children in
both the public and private (via G_PRIVATE_OFFSET) parts of the
instance. It also matches the new private macros nicer.

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

Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>

1 files changed, 59 insertions, 59 deletions

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index ef00d59bc6..a3bc5e1756 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -480,69 +480,69 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
 					       "/org/gtk/libgtk/gtkprintunixdialog.ui");
 
   /* GtkTreeView / GtkTreeModel */
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_treeview);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_list);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_list_filter);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, page_setup_list);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, custom_paper_list);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_icon_column);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_name_column);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_location_column);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_status_column);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_icon_renderer);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_name_renderer);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_location_renderer);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, printer_status_renderer);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_treeview);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_list);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_list_filter);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_setup_list);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, custom_paper_list);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_icon_column);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_name_column);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_location_column);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_status_column);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_icon_renderer);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_name_renderer);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_location_renderer);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_status_renderer);
 
   /* General Widgetry */
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, notebook);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, all_pages_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, all_pages_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, current_page_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, selection_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, range_table);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, page_range_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, page_range_entry);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, copies_spin);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, collate_check);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, reverse_check);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, collate_image);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, page_layout_preview);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, scale_spin);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, page_set_combo);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, print_now_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, print_at_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, print_at_entry);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, print_hold_radio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, preview_button);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, paper_size_combo);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, paper_size_combo_label);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, paper_size_renderer);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, orientation_combo);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, orientation_combo_label);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, conflicts_widget);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, job_page);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, finishing_table);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, finishing_page);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, image_quality_table);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, image_quality_page);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, color_table);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, color_page);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, advanced_vbox);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, advanced_page);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, extension_point);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, notebook);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, current_page_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, selection_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, range_table);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_range_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_range_entry);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, copies_spin);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, collate_check);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, reverse_check);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, collate_image);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_layout_preview);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, scale_spin);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_set_combo);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_now_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_at_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_at_entry);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_hold_radio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, preview_button);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_size_combo);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_size_combo_label);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_size_renderer);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, orientation_combo);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, orientation_combo_label);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, conflicts_widget);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, job_page);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, finishing_table);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, finishing_page);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, image_quality_table);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, image_quality_page);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, color_table);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, color_page);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, advanced_vbox);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, advanced_page);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, extension_point);
 
   /* GtkPrinterOptionWidgets... */
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, pages_per_sheet);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, duplex);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, paper_type);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, paper_source);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, output_tray);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, job_prio);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, billing_info);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, cover_before);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, cover_after);
-  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialogPrivate, number_up_layout);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, pages_per_sheet);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, duplex);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_type);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_source);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, output_tray);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, job_prio);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, billing_info);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, cover_before);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, cover_after);
+  gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, number_up_layout);
 
   /* Callbacks handled in the UI */
   gtk_widget_class_bind_callback (widget_class, gtk_print_unix_dialog_destroy);