1 files changed, 12 insertions, 19 deletions

diff --git a/examples/application6/exampleappprefs.c b/examples/application6/exampleappprefs.c
index 9b3cc33586..4bdf6542ca 100644
--- a/examples/application6/exampleappprefs.c
+++ b/examples/application6/exampleappprefs.c
@@ -7,43 +7,36 @@
 struct _ExampleAppPrefs
 {
   GtkDialog parent;
-};
-
-typedef struct _ExampleAppPrefsPrivate ExampleAppPrefsPrivate;
 
-struct _ExampleAppPrefsPrivate
-{
   GSettings *settings;
   GtkWidget *font;
   GtkWidget *transition;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
-  ExampleAppPrefsPrivate *priv;
-
-  priv = example_app_prefs_get_instance_private (prefs);
   gtk_widget_init_template (GTK_WIDGET (prefs));
-  priv->settings = g_settings_new ("org.gtk.exampleapp");
+  prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind (priv->settings, "font",
-                   priv->font, "font",
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
                    G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (priv->settings, "transition",
-                   priv->transition, "active-id",
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_prefs_dispose (GObject *object)
 {
-  ExampleAppPrefsPrivate *priv;
+  ExampleAppPrefs *prefs;
+
+  prefs = EXAMPLE_APP_PREFS (object);
 
-  priv = example_app_prefs_get_instance_private (EXAMPLE_APP_PREFS (object));
-  g_clear_object (&priv->settings);
+  g_clear_object (&prefs->settings);
 
   G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }
@@ -55,8 +48,8 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/prefs.ui");
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }
 
 ExampleAppPrefs *