From fb7c5396f68f03f634a57654267a67191031e75d Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Fri, 4 Oct 2013 14:21:20 +0200 Subject: Convert to G_DEFINE_TYPE_WITH_PRIVATE part 2 origin commits: https://gitlab.gnome.org/GNOME/eog/commit/ffc4137 https://gitlab.gnome.org/GNOME/eog/commit/ad8c963 https://gitlab.gnome.org/GNOME/eog/commit/afa0dc8 https://gitlab.gnome.org/GNOME/eog/commit/119a768 https://gitlab.gnome.org/GNOME/eog/commit/7725a55 https://gitlab.gnome.org/GNOME/eog/commit/80cf422 --- src/eom-preferences-dialog.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/eom-preferences-dialog.c') diff --git a/src/eom-preferences-dialog.c b/src/eom-preferences-dialog.c index 1c2eb5b..d4a59ad 100644 --- a/src/eom-preferences-dialog.c +++ b/src/eom-preferences-dialog.c @@ -38,11 +38,6 @@ #include #include -#define EOM_PREFERENCES_DIALOG_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PREFERENCES_DIALOG, EomPreferencesDialogPrivate)) - -G_DEFINE_TYPE (EomPreferencesDialog, eom_preferences_dialog, EOM_TYPE_DIALOG); - #define GSETTINGS_OBJECT_KEY "GSETTINGS_KEY" #define GSETTINGS_OBJECT_VALUE "GSETTINGS_VALUE" @@ -54,6 +49,8 @@ struct _EomPreferencesDialogPrivate { static GObject *instance = NULL; +G_DEFINE_TYPE_WITH_PRIVATE (EomPreferencesDialog, eom_preferences_dialog, EOM_TYPE_DIALOG); + static gboolean pd_string_to_rgba_mapping (GValue *value, GVariant *variant, @@ -329,14 +326,12 @@ eom_preferences_dialog_class_init (EomPreferencesDialogClass *class) g_object_class->constructor = eom_preferences_dialog_constructor; g_object_class->dispose = eom_preferences_dialog_dispose; - - g_type_class_add_private (g_object_class, sizeof (EomPreferencesDialogPrivate)); } static void eom_preferences_dialog_init (EomPreferencesDialog *pref_dlg) { - pref_dlg->priv = EOM_PREFERENCES_DIALOG_GET_PRIVATE (pref_dlg); + pref_dlg->priv = eom_preferences_dialog_get_instance_private (pref_dlg); pref_dlg->priv->view_settings = g_settings_new (EOM_CONF_VIEW); pref_dlg->priv->fullscreen_settings = g_settings_new (EOM_CONF_FULLSCREEN); -- cgit v1.2.1