From 94f7f4412338fb4c05f2010f135cfab9985712fa 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 3 origin commits: https://gitlab.gnome.org/GNOME/eog/commit/d7317d2 https://gitlab.gnome.org/GNOME/eog/commit/756dc07 https://gitlab.gnome.org/GNOME/eog/commit/c485fb8 https://gitlab.gnome.org/GNOME/eog/commit/77be951 https://gitlab.gnome.org/GNOME/eog/commit/007273d https://gitlab.gnome.org/GNOME/eog/commit/a545274 https://gitlab.gnome.org/GNOME/eog/commit/e0f99fb https://gitlab.gnome.org/GNOME/eog/commit/1222978 --- src/eom-dialog.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/eom-dialog.c') diff --git a/src/eom-dialog.c b/src/eom-dialog.c index 935c7a1..c99ef99 100644 --- a/src/eom-dialog.c +++ b/src/eom-dialog.c @@ -29,11 +29,6 @@ #include #include -#define EOM_DIALOG_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_DIALOG, EomDialogPrivate)) - -G_DEFINE_TYPE (EomDialog, eom_dialog, G_TYPE_OBJECT); - enum { PROP_0, PROP_PARENT_WINDOW, @@ -45,6 +40,8 @@ struct _EomDialogPrivate { GtkWindow *parent; }; +G_DEFINE_TYPE_WITH_PRIVATE (EomDialog, eom_dialog, G_TYPE_OBJECT); + static void eom_dialog_construct_impl (EomDialog *dialog, const gchar *ui_file, @@ -171,14 +168,12 @@ eom_dialog_class_init (EomDialogClass *class) G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - - g_type_class_add_private (g_object_class, sizeof (EomDialogPrivate)); } static void eom_dialog_init (EomDialog *dialog) { - dialog->priv = EOM_DIALOG_GET_PRIVATE (dialog); + dialog->priv = eom_dialog_get_instance_private (dialog); dialog->priv->dlg = NULL; dialog->priv->xml = NULL; -- cgit v1.2.1