From 5a5612ab8ec4fb31464fa35e049a4a3b7cb64393 Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Fri, 4 Oct 2013 12:07:29 +0200 Subject: Convert to G_DEFINE_TYPE_WITH_PRIVATE part 1 origin commits: https://gitlab.gnome.org/GNOME/eog/commit/35c3864 https://gitlab.gnome.org/GNOME/eog/commit/842775b https://gitlab.gnome.org/GNOME/eog/commit/3fe0bd4 https://gitlab.gnome.org/GNOME/eog/commit/2b25632 https://gitlab.gnome.org/GNOME/eog/commit/f0c977d https://gitlab.gnome.org/GNOME/eog/commit/5cdb1b8 https://gitlab.gnome.org/GNOME/eog/commit/dba0bd4 https://gitlab.gnome.org/GNOME/eog/commit/8e31683 https://gitlab.gnome.org/GNOME/eog/commit/3945bb1 --- src/eom-uri-converter.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/eom-uri-converter.c') diff --git a/src/eom-uri-converter.c b/src/eom-uri-converter.c index 15f519a..2397a28 100644 --- a/src/eom-uri-converter.c +++ b/src/eom-uri-converter.c @@ -51,10 +51,7 @@ static void eom_uri_converter_get_property (GObject *object, GValue *value, GParamSpec *pspec); -#define EOM_URI_CONVERTER_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_URI_CONVERTER, EomURIConverterPrivate)) - -G_DEFINE_TYPE (EomURIConverter, eom_uri_converter, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (EomURIConverter, eom_uri_converter, G_TYPE_OBJECT) static void free_token (gpointer data) @@ -97,11 +94,11 @@ eom_uri_converter_dispose (GObject *object) } static void -eom_uri_converter_init (EomURIConverter *obj) +eom_uri_converter_init (EomURIConverter *conv) { EomURIConverterPrivate *priv; - priv = obj->priv = EOM_URI_CONVERTER_GET_PRIVATE (obj); + priv = conv->priv = eom_uri_converter_get_instance_private (conv); priv->convert_spaces = FALSE; priv->space_character = '_'; @@ -161,8 +158,6 @@ eom_uri_converter_class_init (EomURIConverterClass *klass) G_MAXUINT, 1, G_PARAM_WRITABLE)); - - g_type_class_add_private (klass, sizeof (EomURIConverterPrivate)); } GQuark -- cgit v1.2.1