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-file-chooser.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/eom-file-chooser.c') diff --git a/src/eom-file-chooser.c b/src/eom-file-chooser.c index b7caf3c..009b45b 100644 --- a/src/eom-file-chooser.c +++ b/src/eom-file-chooser.c @@ -41,10 +41,6 @@ static char *last_dir[] = { NULL, NULL, NULL, NULL }; #define FILE_FORMAT_KEY "file-format" -#define EOM_FILE_CHOOSER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \ - EOM_TYPE_FILE_CHOOSER, \ - EomFileChooserPrivate)) - struct _EomFileChooserPrivate { MateDesktopThumbnailFactory *thumb_factory; @@ -55,7 +51,7 @@ struct _EomFileChooserPrivate GtkWidget *creator_label; }; -G_DEFINE_TYPE(EomFileChooser, eom_file_chooser, GTK_TYPE_FILE_CHOOSER_DIALOG) +G_DEFINE_TYPE_WITH_PRIVATE (EomFileChooser, eom_file_chooser, GTK_TYPE_FILE_CHOOSER_DIALOG) static void eom_file_chooser_finalize (GObject *object) @@ -76,14 +72,12 @@ eom_file_chooser_class_init (EomFileChooserClass *klass) GObjectClass *object_class = (GObjectClass *) klass; object_class->finalize = eom_file_chooser_finalize; - - g_type_class_add_private (object_class, sizeof (EomFileChooserPrivate)); } static void eom_file_chooser_init (EomFileChooser *chooser) { - chooser->priv = EOM_FILE_CHOOSER_GET_PRIVATE (chooser); + chooser->priv = eom_file_chooser_get_instance_private (chooser); } static void -- cgit v1.2.1