[eog] EogURIConverter: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] EogURIConverter: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- Date: Fri, 4 Oct 2013 13:26:56 +0000 (UTC)
commit 5cdb1b84a729cacefab58bfa0687b4abc96ad3a5
Author: Felix Riemann <friemann gnome org>
Date: Fri Oct 4 13:48:11 2013 +0200
EogURIConverter: Convert to G_DEFINE_TYPE_WITH_PRIVATE
src/eog-uri-converter.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/eog-uri-converter.c b/src/eog-uri-converter.c
index 3f6b460..5c2fe0a 100644
--- a/src/eog-uri-converter.c
+++ b/src/eog-uri-converter.c
@@ -52,10 +52,7 @@ static void eog_uri_converter_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
-#define EOG_URI_CONVERTER_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_URI_CONVERTER, EogURIConverterPrivate))
-
-G_DEFINE_TYPE (EogURIConverter, eog_uri_converter, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (EogURIConverter, eog_uri_converter, G_TYPE_OBJECT)
static void
free_token (gpointer data)
@@ -98,11 +95,11 @@ eog_uri_converter_dispose (GObject *object)
}
static void
-eog_uri_converter_init (EogURIConverter *obj)
+eog_uri_converter_init (EogURIConverter *conv)
{
EogURIConverterPrivate *priv;
- priv = obj->priv = EOG_URI_CONVERTER_GET_PRIVATE (obj);
+ priv = conv->priv = eog_uri_converter_get_instance_private (conv);
priv->convert_spaces = FALSE;
priv->space_character = '_';
@@ -162,8 +159,6 @@ eog_uri_converter_class_init (EogURIConverterClass *klass)
G_MAXUINT,
1,
G_PARAM_WRITABLE));
-
- g_type_class_add_private (klass, sizeof (EogURIConverterPrivate));
}
GQuark
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]