diff options
| author | Felix Riemann <[email protected]> | 2013-10-04 14:21:20 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-07-17 21:53:38 +0200 |
| commit | fb7c5396f68f03f634a57654267a67191031e75d (patch) | |
| tree | f634486c039fa81b6953abc192fffa02dca3d6a4 /src/eom-metadata-reader-jpg.c | |
| parent | 5a5612ab8ec4fb31464fa35e049a4a3b7cb64393 (diff) | |
| download | eom-fb7c5396f68f03f634a57654267a67191031e75d.tar.bz2 eom-fb7c5396f68f03f634a57654267a67191031e75d.tar.xz | |
Convert to G_DEFINE_TYPE_WITH_PRIVATE part 2
origin commits:
https://gitlab.gnome.org/GNOME/eog/commit/ffc4137
https://gitlab.gnome.org/GNOME/eog/commit/ad8c963
https://gitlab.gnome.org/GNOME/eog/commit/afa0dc8
https://gitlab.gnome.org/GNOME/eog/commit/119a768
https://gitlab.gnome.org/GNOME/eog/commit/7725a55
https://gitlab.gnome.org/GNOME/eog/commit/80cf422
Diffstat (limited to 'src/eom-metadata-reader-jpg.c')
| -rw-r--r-- | src/eom-metadata-reader-jpg.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/eom-metadata-reader-jpg.c b/src/eom-metadata-reader-jpg.c index 9fc79b7..f965861 100644 --- a/src/eom-metadata-reader-jpg.c +++ b/src/eom-metadata-reader-jpg.c @@ -86,9 +86,6 @@ struct _EomMetadataReaderJpgPrivate { int bytes_read; }; -#define EOM_METADATA_READER_JPG_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_METADATA_READER_JPG, EomMetadataReaderJpgPrivate)) - static void eom_metadata_reader_jpg_init_emr_iface (gpointer g_iface, gpointer iface_data); @@ -96,7 +93,8 @@ eom_metadata_reader_jpg_init_emr_iface (gpointer g_iface, gpointer iface_data); G_DEFINE_TYPE_WITH_CODE (EomMetadataReaderJpg, eom_metadata_reader_jpg, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (EOM_TYPE_METADATA_READER, - eom_metadata_reader_jpg_init_emr_iface)) + eom_metadata_reader_jpg_init_emr_iface) \ + G_ADD_PRIVATE (EomMetadataReaderJpg)) static void @@ -128,11 +126,11 @@ eom_metadata_reader_jpg_dispose (GObject *object) } static void -eom_metadata_reader_jpg_init (EomMetadataReaderJpg *obj) +eom_metadata_reader_jpg_init (EomMetadataReaderJpg *emr) { EomMetadataReaderJpgPrivate *priv; - priv = obj->priv = EOM_METADATA_READER_JPG_GET_PRIVATE (obj); + priv = emr->priv = eom_metadata_reader_jpg_get_instance_private (emr); priv->exif_chunk = NULL; priv->exif_len = 0; priv->iptc_chunk = NULL; @@ -147,8 +145,6 @@ eom_metadata_reader_jpg_class_init (EomMetadataReaderJpgClass *klass) GObjectClass *object_class = (GObjectClass*) klass; object_class->dispose = eom_metadata_reader_jpg_dispose; - - g_type_class_add_private (klass, sizeof (EomMetadataReaderJpgPrivate)); } static gboolean |