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-application.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/eom-application.c') diff --git a/src/eom-application.c b/src/eom-application.c index 9830bd2..f49d37c 100644 --- a/src/eom-application.c +++ b/src/eom-application.c @@ -46,10 +46,7 @@ static void eom_application_load_accelerators (void); static void eom_application_save_accelerators (void); -#define EOM_APPLICATION_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_APPLICATION, EomApplicationPrivate)) - -G_DEFINE_TYPE (EomApplication, eom_application, GTK_TYPE_APPLICATION); +G_DEFINE_TYPE_WITH_PRIVATE (EomApplication, eom_application, GTK_TYPE_APPLICATION); static void eom_application_activate (GApplication *application) @@ -141,9 +138,6 @@ eom_application_class_init (EomApplicationClass *eom_application_class) GApplicationClass *application_class; GObjectClass *object_class; - g_type_class_add_private (eom_application_class, - sizeof (EomApplicationPrivate)); - application_class = (GApplicationClass *) eom_application_class; object_class = (GObjectClass *) eom_application_class; @@ -181,7 +175,7 @@ eom_application_init (EomApplication *eom_application) eom_session_init (eom_application); - eom_application->priv = EOM_APPLICATION_GET_PRIVATE (eom_application); + eom_application->priv = eom_application_get_instance_private (eom_application); priv = eom_application->priv; priv->toolbars_model = egg_toolbars_model_new (); -- cgit v1.2.1