[gnome-photos] Switch everything to G_ADD_PRIVATE()!
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] Switch everything to G_ADD_PRIVATE()!
- Date: Tue, 6 Aug 2013 16:45:39 +0000 (UTC)
commit 37dfb5cc0569b979568cc688cbd2ccf0efd357bd
Author: Emanuele Aina <emanuele aina collabora com>
Date: Mon Aug 5 17:06:48 2013 +0200
Switch everything to G_ADD_PRIVATE()!
Since after commit f0b9f17bd we now depend on new enough GTK+/GLib
versions to be able to use GtkWidget templates, let's switch to
G_ADD_PRIVATE()/G_DEFINE_TYPE_WITH_PRIVATE() and friends for all the
photos-* objects.
https://bugzilla.gnome.org/show_bug.cgi?id=705551
src/photos-application.c | 8 ++------
src/photos-base-item.c | 6 ++----
src/photos-base-manager.c | 6 ++----
src/photos-collection-icon-watcher.c | 8 ++------
src/photos-create-collection-job.c | 8 ++------
src/photos-delete-item-job.c | 8 ++------
src/photos-dlna-renderer.c | 6 ++----
src/photos-dlna-renderers-manager.c | 7 ++-----
src/photos-embed.c | 6 ++----
src/photos-error-box.c | 6 ++----
src/photos-fetch-collection-state-job.c | 8 ++------
src/photos-fetch-collections-job.c | 8 ++------
src/photos-flickr-item.c | 6 ++----
src/photos-header-bar.c | 6 ++----
src/photos-indexing-notification.c | 8 ++------
src/photos-item-manager.c | 6 ++----
src/photos-load-more-button.c | 6 ++----
src/photos-main-toolbar.c | 6 ++----
src/photos-main-window.c | 6 ++----
src/photos-mode-controller.c | 6 ++----
src/photos-notification-manager.c | 8 ++------
src/photos-offset-collections-controller.c | 12 ++++--------
src/photos-offset-controller.c | 8 ++------
src/photos-offset-favorites-controller.c | 10 ++++------
src/photos-organize-collection-dialog.c | 8 ++------
src/photos-organize-collection-model.c | 8 ++------
src/photos-organize-collection-view.c | 8 ++------
src/photos-preview-nav-buttons.c | 6 ++----
src/photos-preview-view.c | 6 ++----
src/photos-print-operation.c | 8 ++------
src/photos-print-preview.c | 13 +++++--------
src/photos-print-setup.c | 8 ++------
src/photos-properties-dialog.c | 8 ++------
src/photos-remote-display-manager.c | 11 ++++-------
src/photos-search-type.c | 5 ++---
src/photos-selection-controller.c | 8 ++------
src/photos-selection-toolbar.c | 6 ++----
src/photos-set-collection-job.c | 6 ++----
src/photos-single-item-job.c | 6 ++----
src/photos-source-manager.c | 6 ++----
src/photos-source.c | 5 ++---
src/photos-spinner-box.c | 6 ++----
src/photos-tracker-change-monitor.c | 8 ++------
src/photos-tracker-collections-controller.c | 12 ++++--------
src/photos-tracker-controller.c | 6 ++----
src/photos-tracker-favorites-controller.c | 12 ++++--------
src/photos-tracker-queue.c | 6 ++----
src/photos-update-mtime-job.c | 6 ++----
src/photos-view-container.c | 8 ++------
src/photos-view-model.c | 6 ++----
50 files changed, 113 insertions(+), 256 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index a6f8d67..0a9c27d 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -66,7 +66,7 @@ struct _PhotosApplicationPrivate
};
-G_DEFINE_TYPE (PhotosApplication, photos_application, GTK_TYPE_APPLICATION)
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosApplication, photos_application, GTK_TYPE_APPLICATION)
enum
@@ -558,9 +558,7 @@ photos_application_dispose (GObject *object)
static void
photos_application_init (PhotosApplication *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_APPLICATION,
- PhotosApplicationPrivate);
+ self->priv = photos_application_get_instance_private (self);
eog_debug_init ();
}
@@ -577,8 +575,6 @@ photos_application_class_init (PhotosApplicationClass *class)
application_class->startup = photos_application_startup;
/* TODO: Add miners-changed signal */
-
- g_type_class_add_private (class, sizeof (PhotosApplicationPrivate));
}
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index ce4fc60..95b1ec8 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -88,7 +88,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PhotosBaseItem, photos_base_item, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosBaseItem, photos_base_item, G_TYPE_OBJECT);
typedef struct _PhotosBaseItemAsyncStrData PhotosBaseItemAsyncStrData;
@@ -866,7 +866,7 @@ photos_base_item_init (PhotosBaseItem *self)
{
PhotosBaseItemPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_BASE_ITEM, PhotosBaseItemPrivate);
+ self->priv = photos_base_item_get_instance_private (self);
priv = self->priv;
g_mutex_init (&priv->mutex_create_thumbnail);
@@ -923,8 +923,6 @@ photos_base_item_class_init (PhotosBaseItemClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
-
- g_type_class_add_private (class, sizeof (PhotosBaseItemPrivate));
}
diff --git a/src/photos-base-manager.c b/src/photos-base-manager.c
index 768c05b..4fbceac 100644
--- a/src/photos-base-manager.c
+++ b/src/photos-base-manager.c
@@ -49,7 +49,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PhotosBaseManager, photos_base_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosBaseManager, photos_base_manager, G_TYPE_OBJECT);
static gboolean
@@ -134,7 +134,7 @@ photos_base_manager_init (PhotosBaseManager *self)
{
PhotosBaseManagerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_BASE_MANAGER, PhotosBaseManagerPrivate);
+ self->priv = photos_base_manager_get_instance_private (self);
priv = self->priv;
priv->objects = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
@@ -195,8 +195,6 @@ photos_base_manager_class_init (PhotosBaseManagerClass *class)
G_TYPE_NONE,
1,
G_TYPE_OBJECT);
-
- g_type_class_add_private (class, sizeof (PhotosBaseManagerPrivate));
}
diff --git a/src/photos-collection-icon-watcher.c b/src/photos-collection-icon-watcher.c
index d11ff05..741127e 100644
--- a/src/photos-collection-icon-watcher.c
+++ b/src/photos-collection-icon-watcher.c
@@ -64,7 +64,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PhotosCollectionIconWatcher, photos_collection_icon_watcher, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosCollectionIconWatcher, photos_collection_icon_watcher, G_TYPE_OBJECT);
static void
@@ -383,9 +383,7 @@ photos_collection_icon_watcher_init (PhotosCollectionIconWatcher *self)
{
PhotosCollectionIconWatcherPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_COLLECTION_ICON_WATCHER,
- PhotosCollectionIconWatcherPrivate);
+ self->priv = photos_collection_icon_watcher_get_instance_private (self);
priv = self->priv;
priv->item_connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref);
@@ -423,8 +421,6 @@ photos_collection_icon_watcher_class_init (PhotosCollectionIconWatcherClass *cla
G_TYPE_NONE,
1,
G_TYPE_ICON);
-
- g_type_class_add_private (class, sizeof (PhotosCollectionIconWatcherPrivate));
}
diff --git a/src/photos-create-collection-job.c b/src/photos-create-collection-job.c
index 3b84592..9221b15 100644
--- a/src/photos-create-collection-job.c
+++ b/src/photos-create-collection-job.c
@@ -50,7 +50,7 @@ enum
};
-G_DEFINE_TYPE (PhotosCreateCollectionJob, photos_create_collection_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosCreateCollectionJob, photos_create_collection_job, G_TYPE_OBJECT);
static void
@@ -154,9 +154,7 @@ photos_create_collection_job_init (PhotosCreateCollectionJob *self)
{
PhotosCreateCollectionJobPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_CREATE_COLLECTION_JOB,
- PhotosCreateCollectionJobPrivate);
+ self->priv = photos_create_collection_job_get_instance_private (self);
priv = self->priv;
priv->queue = photos_tracker_queue_new ();
@@ -179,8 +177,6 @@ photos_create_collection_job_class_init (PhotosCreateCollectionJobClass *class)
"The name of the collection to be created",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosCreateCollectionJobPrivate));
}
diff --git a/src/photos-delete-item-job.c b/src/photos-delete-item-job.c
index 912c3ef..b7a4693 100644
--- a/src/photos-delete-item-job.c
+++ b/src/photos-delete-item-job.c
@@ -49,7 +49,7 @@ enum
};
-G_DEFINE_TYPE (PhotosDeleteItemJob, photos_delete_item_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosDeleteItemJob, photos_delete_item_job, G_TYPE_OBJECT);
static void
@@ -120,9 +120,7 @@ photos_delete_item_job_init (PhotosDeleteItemJob *self)
{
PhotosDeleteItemJobPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_DELETE_ITEM_JOB,
- PhotosDeleteItemJobPrivate);
+ self->priv = photos_delete_item_job_get_instance_private (self);
priv = self->priv;
priv->queue = photos_tracker_queue_new ();
@@ -145,8 +143,6 @@ photos_delete_item_job_class_init (PhotosDeleteItemJobClass *class)
"An unique ID associated with this item",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosDeleteItemJobPrivate));
}
diff --git a/src/photos-dlna-renderer.c b/src/photos-dlna-renderer.c
index 89928c9..c911e00 100644
--- a/src/photos-dlna-renderer.c
+++ b/src/photos-dlna-renderer.c
@@ -56,6 +56,7 @@ static void photos_dlna_renderer_async_initable_iface_init (GAsyncInitableIface
G_DEFINE_TYPE_WITH_CODE (PhotosDlnaRenderer, photos_dlna_renderer, G_TYPE_OBJECT,
+ G_ADD_PRIVATE (PhotosDlnaRenderer)
G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE,
photos_dlna_renderer_async_initable_iface_init));
#define RETURN_ON_ERROR(task, error, msg) \
@@ -157,8 +158,7 @@ photos_dlna_renderer_init (PhotosDlnaRenderer *self)
{
PhotosDlnaRendererPrivate *priv;
- self->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_DLNA_RENDERER,
- PhotosDlnaRendererPrivate);
+ self->priv = priv = photos_dlna_renderer_get_instance_private (self);
priv->urls_to_item = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
}
@@ -236,8 +236,6 @@ photos_dlna_renderer_class_init (PhotosDlnaRendererClass *class)
G_PARAM_STATIC_NAME |
G_PARAM_STATIC_BLURB |
G_PARAM_STATIC_NICK));
-
- g_type_class_add_private (class, sizeof (PhotosDlnaRendererPrivate));
}
diff --git a/src/photos-dlna-renderers-manager.c b/src/photos-dlna-renderers-manager.c
index 33d99ea..3bfca1b 100644
--- a/src/photos-dlna-renderers-manager.c
+++ b/src/photos-dlna-renderers-manager.c
@@ -45,7 +45,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
static GObject *photos_dlna_renderers_manager_singleton = NULL;
-G_DEFINE_TYPE (PhotosDlnaRenderersManager, photos_dlna_renderers_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosDlnaRenderersManager, photos_dlna_renderers_manager, G_TYPE_OBJECT);
static void
photos_dlna_renderers_manager_dispose (GObject *object)
@@ -196,8 +196,7 @@ photos_dlna_renderers_manager_init (PhotosDlnaRenderersManager *self)
{
PhotosDlnaRenderersManagerPrivate *priv;
- self->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_DLNA_RENDERERS_MANAGER,
- PhotosDlnaRenderersManagerPrivate);
+ self->priv = priv = photos_dlna_renderers_manager_get_instance_private (self);
dleyna_manager_proxy_new_for_bus (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
@@ -226,8 +225,6 @@ photos_dlna_renderers_manager_class_init (PhotosDlnaRenderersManagerClass *class
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, PHOTOS_TYPE_DLNA_RENDERER);
-
- g_type_class_add_private (class, sizeof (PhotosDlnaRenderersManagerPrivate));
}
PhotosDlnaRenderersManager *
diff --git a/src/photos-embed.c b/src/photos-embed.c
index 8554016..de857d3 100644
--- a/src/photos-embed.c
+++ b/src/photos-embed.c
@@ -71,7 +71,7 @@ struct _PhotosEmbedPrivate
};
-G_DEFINE_TYPE (PhotosEmbed, photos_embed, GTK_TYPE_BOX);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosEmbed, photos_embed, GTK_TYPE_BOX);
static void photos_embed_changes_pending (PhotosEmbed *self, GHashTable *changes);
@@ -456,7 +456,7 @@ photos_embed_init (PhotosEmbed *self)
PhotosEmbedPrivate *priv;
gboolean querying;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_EMBED, PhotosEmbedPrivate);
+ self->priv = photos_embed_get_instance_private (self);
priv = self->priv;
gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
@@ -550,8 +550,6 @@ photos_embed_class_init (PhotosEmbedClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = photos_embed_dispose;
-
- g_type_class_add_private (class, sizeof (PhotosEmbedPrivate));
}
diff --git a/src/photos-error-box.c b/src/photos-error-box.c
index 33cc206..225495f 100644
--- a/src/photos-error-box.c
+++ b/src/photos-error-box.c
@@ -38,7 +38,7 @@ struct _PhotosErrorBoxPrivate
};
-G_DEFINE_TYPE (PhotosErrorBox, photos_error_box, GTK_TYPE_GRID);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosErrorBox, photos_error_box, GTK_TYPE_GRID);
static void
@@ -81,7 +81,7 @@ photos_error_box_constructed (GObject *object)
static void
photos_error_box_init (PhotosErrorBox *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_ERROR_BOX, PhotosErrorBoxPrivate);
+ self->priv = photos_error_box_get_instance_private (self);
}
@@ -91,8 +91,6 @@ photos_error_box_class_init (PhotosErrorBoxClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->constructed = photos_error_box_constructed;
-
- g_type_class_add_private (class, sizeof (PhotosErrorBoxPrivate));
}
diff --git a/src/photos-fetch-collection-state-job.c b/src/photos-fetch-collection-state-job.c
index 616c611..894be76 100644
--- a/src/photos-fetch-collection-state-job.c
+++ b/src/photos-fetch-collection-state-job.c
@@ -51,7 +51,7 @@ struct _PhotosFetchCollectionStateJobPrivate
};
-G_DEFINE_TYPE (PhotosFetchCollectionStateJob, photos_fetch_collection_state_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosFetchCollectionStateJob, photos_fetch_collection_state_job, G_TYPE_OBJECT);
typedef struct _PhotosFetchCollectionStateJobData PhotosFetchCollectionStateJobData;
@@ -218,9 +218,7 @@ photos_fetch_collection_state_job_init (PhotosFetchCollectionStateJob *self)
{
PhotosFetchCollectionStateJobPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_FETCH_COLLECTION_STATE_JOB,
- PhotosFetchCollectionStateJobPrivate);
+ self->priv = photos_fetch_collection_state_job_get_instance_private (self);
priv = self->priv;
priv->collections_for_items = g_hash_table_new_full (g_str_hash,
@@ -242,8 +240,6 @@ photos_fetch_collection_state_job_class_init (PhotosFetchCollectionStateJobClass
object_class->dispose = photos_fetch_collection_state_job_dispose;
object_class->finalize = photos_fetch_collection_state_job_finalize;
-
- g_type_class_add_private (class, sizeof (PhotosFetchCollectionStateJobPrivate));
}
diff --git a/src/photos-fetch-collections-job.c b/src/photos-fetch-collections-job.c
index 228a117..71702f6 100644
--- a/src/photos-fetch-collections-job.c
+++ b/src/photos-fetch-collections-job.c
@@ -50,7 +50,7 @@ enum
};
-G_DEFINE_TYPE (PhotosFetchCollectionsJob, photos_fetch_collections_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosFetchCollectionsJob, photos_fetch_collections_job, G_TYPE_OBJECT);
static void
@@ -176,9 +176,7 @@ photos_fetch_collections_job_init (PhotosFetchCollectionsJob *self)
{
PhotosFetchCollectionsJobPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_FETCH_COLLECTIONS_JOB,
- PhotosFetchCollectionsJobPrivate);
+ self->priv = photos_fetch_collections_job_get_instance_private (self);
priv = self->priv;
priv->queue = photos_tracker_queue_new ();
@@ -201,8 +199,6 @@ photos_fetch_collections_job_class_init (PhotosFetchCollectionsJobClass *class)
"An unique ID associated with this item",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosFetchCollectionsJobPrivate));
}
diff --git a/src/photos-flickr-item.c b/src/photos-flickr-item.c
index 98c34eb..eb42860 100644
--- a/src/photos-flickr-item.c
+++ b/src/photos-flickr-item.c
@@ -45,7 +45,7 @@ struct _PhotosFlickrItemPrivate
};
-G_DEFINE_TYPE (PhotosFlickrItem, photos_flickr_item, PHOTOS_TYPE_BASE_ITEM);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosFlickrItem, photos_flickr_item, PHOTOS_TYPE_BASE_ITEM);
typedef struct _PhotosFlickrItemSyncData PhotosFlickrItemSyncData;
@@ -341,7 +341,7 @@ photos_flickr_item_init (PhotosFlickrItem *self)
{
PhotosFlickrItemPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_FLICKR_ITEM, PhotosFlickrItemPrivate);
+ self->priv = photos_flickr_item_get_instance_private (self);
priv = self->priv;
priv->src_mngr = photos_source_manager_new ();
@@ -360,8 +360,6 @@ photos_flickr_item_class_init (PhotosFlickrItemClass *class)
base_item_class->download = photos_flickr_item_download;
base_item_class->get_source_name = photos_flickr_item_get_source_name;
base_item_class->open = photos_flickr_item_open;
-
- g_type_class_add_private (class, sizeof (PhotosFlickrItemPrivate));
}
diff --git a/src/photos-header-bar.c b/src/photos-header-bar.c
index 6e87961..f5b60f2 100644
--- a/src/photos-header-bar.c
+++ b/src/photos-header-bar.c
@@ -36,7 +36,7 @@ struct _PhotosHeaderBarPrivate
};
-G_DEFINE_TYPE (PhotosHeaderBar, photos_header_bar, GTK_TYPE_HEADER_BAR);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosHeaderBar, photos_header_bar, GTK_TYPE_HEADER_BAR);
static void
@@ -70,7 +70,7 @@ photos_header_bar_init (PhotosHeaderBar *self)
{
PhotosHeaderBarPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_HEADER_BAR, PhotosHeaderBarPrivate);
+ self->priv = photos_header_bar_get_instance_private (self);
priv = self->priv;
priv->stack_switcher = g_object_ref_sink (gtk_stack_switcher_new ());
@@ -87,8 +87,6 @@ photos_header_bar_class_init (PhotosHeaderBarClass *class)
object_class->dispose = photos_header_bar_dispose;
widget_class->realize = photos_header_bar_realize;
-
- g_type_class_add_private (class, sizeof (PhotosHeaderBarPrivate));
}
diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c
index 3296571..f459901 100644
--- a/src/photos-indexing-notification.c
+++ b/src/photos-indexing-notification.c
@@ -43,7 +43,7 @@ struct _PhotosIndexingNotificationPrivate
};
-G_DEFINE_TYPE (PhotosIndexingNotification, photos_indexing_notification, GTK_TYPE_GRID);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosIndexingNotification, photos_indexing_notification, GTK_TYPE_GRID);
static const gchar *MINER_FILES = "org.freedesktop.Tracker1.Miner.Files";
@@ -141,9 +141,7 @@ photos_indexing_notification_init (PhotosIndexingNotification *self)
GtkWidget *primary;
GtkWidget *secondary;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_INDEXING_NOTIFICATION,
- PhotosIndexingNotificationPrivate);
+ self->priv = photos_indexing_notification_get_instance_private (self);
priv = self->priv;
error = NULL;
@@ -203,8 +201,6 @@ photos_indexing_notification_class_init (PhotosIndexingNotificationClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = photos_indexing_notification_dispose;
-
- g_type_class_add_private (class, sizeof (PhotosIndexingNotificationPrivate));
}
diff --git a/src/photos-item-manager.c b/src/photos-item-manager.c
index 84e00f0..f53737d 100644
--- a/src/photos-item-manager.c
+++ b/src/photos-item-manager.c
@@ -45,7 +45,7 @@ struct _PhotosItemManagerPrivate
};
-G_DEFINE_TYPE (PhotosItemManager, photos_item_manager, PHOTOS_TYPE_BASE_MANAGER);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosItemManager, photos_item_manager, PHOTOS_TYPE_BASE_MANAGER);
static void
@@ -204,7 +204,7 @@ photos_item_manager_init (PhotosItemManager *self)
{
PhotosItemManagerPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_ITEM_MANAGER, PhotosItemManagerPrivate);
+ self->priv = photos_item_manager_get_instance_private (self);
priv = self->priv;
priv->collection_path = g_queue_new ();
@@ -224,8 +224,6 @@ photos_item_manager_class_init (PhotosItemManagerClass *class)
object_class->constructor = photos_item_manager_constructor;
object_class->dispose = photos_item_manager_dispose;
base_manager_class->set_active_object = photos_item_manager_set_active_object;
-
- g_type_class_add_private (class, sizeof (PhotosItemManagerPrivate));
}
diff --git a/src/photos-load-more-button.c b/src/photos-load-more-button.c
index f432996..7d6a1ae 100644
--- a/src/photos-load-more-button.c
+++ b/src/photos-load-more-button.c
@@ -52,7 +52,7 @@ enum
};
-G_DEFINE_TYPE (PhotosLoadMoreButton, photos_load_more_button, GTK_TYPE_BUTTON);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosLoadMoreButton, photos_load_more_button, GTK_TYPE_BUTTON);
static void
@@ -166,7 +166,7 @@ photos_load_more_button_init (PhotosLoadMoreButton *self)
GtkStyleContext *context;
GtkWidget *child;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_LOAD_MORE_BUTTON, PhotosLoadMoreButtonPrivate);
+ self->priv = photos_load_more_button_get_instance_private (self);
priv = self->priv;
gtk_widget_set_no_show_all (GTK_WIDGET (self), TRUE);
@@ -211,8 +211,6 @@ photos_load_more_button_class_init (PhotosLoadMoreButtonClass *class)
PHOTOS_TYPE_WINDOW_MODE,
PHOTOS_WINDOW_MODE_NONE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosLoadMoreButtonPrivate));
}
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index 15f722a..8197dc5 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -59,7 +59,7 @@ struct _PhotosMainToolbarPrivate
};
-G_DEFINE_TYPE (PhotosMainToolbar, photos_main_toolbar, GTK_TYPE_BOX);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosMainToolbar, photos_main_toolbar, GTK_TYPE_BOX);
static void
@@ -584,7 +584,7 @@ photos_main_toolbar_init (PhotosMainToolbar *self)
GtkApplication *app;
GtkBuilder *builder;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_MAIN_TOOLBAR, PhotosMainToolbarPrivate);
+ self->priv = photos_main_toolbar_get_instance_private (self);
priv = self->priv;
gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
@@ -662,8 +662,6 @@ photos_main_toolbar_class_init (PhotosMainToolbarClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = photos_main_toolbar_dispose;
-
- g_type_class_add_private (class, sizeof (PhotosMainToolbarPrivate));
}
diff --git a/src/photos-main-window.c b/src/photos-main-window.c
index aecda02..b17d387 100644
--- a/src/photos-main-window.c
+++ b/src/photos-main-window.c
@@ -46,7 +46,7 @@ struct _PhotosMainWindowPrivate
};
-G_DEFINE_TYPE (PhotosMainWindow, photos_main_window, GTK_TYPE_APPLICATION_WINDOW);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosMainWindow, photos_main_window, GTK_TYPE_APPLICATION_WINDOW);
enum
@@ -249,7 +249,7 @@ photos_main_window_init (PhotosMainWindow *self)
const gint32 *size;
gsize n_elements;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_MAIN_WINDOW, PhotosMainWindowPrivate);
+ self->priv = photos_main_window_get_instance_private (self);
priv = self->priv;
priv->settings = photos_settings_new ();
@@ -294,8 +294,6 @@ photos_main_window_class_init (PhotosMainWindowClass *class)
widget_class->delete_event = photos_main_window_delete_event;
widget_class->key_press_event = photos_main_window_key_press_event;
widget_class->window_state_event = photos_main_window_window_state_event;
-
- g_type_class_add_private (class, sizeof (PhotosMainWindowPrivate));
}
diff --git a/src/photos-mode-controller.c b/src/photos-mode-controller.c
index 8b4ad83..3ce0242 100644
--- a/src/photos-mode-controller.c
+++ b/src/photos-mode-controller.c
@@ -51,7 +51,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PhotosModeController, photos_mode_controller, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosModeController, photos_mode_controller, G_TYPE_OBJECT);
static GObject *
@@ -77,7 +77,7 @@ photos_mode_controller_init (PhotosModeController *self)
{
PhotosModeControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_MODE_CONTROLLER, PhotosModeControllerPrivate);
+ self->priv = photos_mode_controller_get_instance_private (self);
priv = self->priv;
priv->mode = PHOTOS_WINDOW_MODE_NONE;
@@ -128,8 +128,6 @@ photos_mode_controller_class_init (PhotosModeControllerClass *class)
2,
PHOTOS_TYPE_WINDOW_MODE,
PHOTOS_TYPE_WINDOW_MODE);
-
- g_type_class_add_private (class, sizeof (PhotosModeControllerPrivate));
}
diff --git a/src/photos-notification-manager.c b/src/photos-notification-manager.c
index eac5c98..e52aa1d 100644
--- a/src/photos-notification-manager.c
+++ b/src/photos-notification-manager.c
@@ -38,7 +38,7 @@ struct _PhotosNotificationManagerPrivate
};
-G_DEFINE_TYPE (PhotosNotificationManager, photos_notification_manager, GD_TYPE_NOTIFICATION);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosNotificationManager, photos_notification_manager, GD_TYPE_NOTIFICATION);
static void
@@ -79,9 +79,7 @@ photos_notification_manager_init (PhotosNotificationManager *self)
{
PhotosNotificationManagerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_NOTIFICATION_MANAGER,
- PhotosNotificationManagerPrivate);
+ self->priv = photos_notification_manager_get_instance_private (self);
priv = self->priv;
gtk_widget_set_halign (GTK_WIDGET (self), GTK_ALIGN_CENTER);
@@ -104,8 +102,6 @@ photos_notification_manager_class_init (PhotosNotificationManagerClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->constructor = photos_notification_manager_constructor;
-
- g_type_class_add_private (class, sizeof (PhotosNotificationManagerPrivate));
}
diff --git a/src/photos-offset-collections-controller.c b/src/photos-offset-collections-controller.c
index 0565ed0..fc4bc61 100644
--- a/src/photos-offset-collections-controller.c
+++ b/src/photos-offset-collections-controller.c
@@ -36,9 +36,9 @@ struct _PhotosOffsetCollectionsControllerPrivate
};
-G_DEFINE_TYPE (PhotosOffsetCollectionsController,
- photos_offset_collections_controller,
- PHOTOS_TYPE_OFFSET_CONTROLLER);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosOffsetCollectionsController,
+ photos_offset_collections_controller,
+ PHOTOS_TYPE_OFFSET_CONTROLLER);
static PhotosQuery *
@@ -94,9 +94,7 @@ photos_offset_collections_controller_init (PhotosOffsetCollectionsController *se
{
PhotosOffsetCollectionsControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_OFFSET_COLLECTIONS_CONTROLLER,
- PhotosOffsetCollectionsControllerPrivate);
+ self->priv = photos_offset_collections_controller_get_instance_private (self);
priv = self->priv;
priv->col_mngr = photos_collection_manager_new ();
@@ -112,8 +110,6 @@ photos_offset_collections_controller_class_init (PhotosOffsetCollectionsControll
object_class->constructor = photos_offset_collections_controller_constructor;
object_class->dispose = photos_offset_collections_controller_dispose;
offset_controller_class->get_query = photos_offset_collections_controller_get_query;
-
- g_type_class_add_private (class, sizeof (PhotosOffsetCollectionsControllerPrivate));
}
diff --git a/src/photos-offset-controller.c b/src/photos-offset-controller.c
index 96ba810..796bbc0 100644
--- a/src/photos-offset-controller.c
+++ b/src/photos-offset-controller.c
@@ -50,7 +50,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_ABSTRACT_TYPE (PhotosOffsetController, photos_offset_controller, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (PhotosOffsetController, photos_offset_controller, G_TYPE_OBJECT);
enum
@@ -116,9 +116,7 @@ photos_offset_controller_init (PhotosOffsetController *self)
{
PhotosOffsetControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_OFFSET_CONTROLLER,
- PhotosOffsetControllerPrivate);
+ self->priv = photos_offset_controller_get_instance_private (self);
priv = self->priv;
priv->queue = photos_tracker_queue_new ();
@@ -155,8 +153,6 @@ photos_offset_controller_class_init (PhotosOffsetControllerClass *class)
G_TYPE_NONE,
1,
G_TYPE_INT);
-
- g_type_class_add_private (class, sizeof (PhotosOffsetControllerPrivate));
}
diff --git a/src/photos-offset-favorites-controller.c b/src/photos-offset-favorites-controller.c
index 78293ae..fd72daf 100644
--- a/src/photos-offset-favorites-controller.c
+++ b/src/photos-offset-favorites-controller.c
@@ -36,7 +36,9 @@ struct _PhotosOffsetFavoritesControllerPrivate
};
-G_DEFINE_TYPE (PhotosOffsetFavoritesController, photos_offset_favorites_controller,
PHOTOS_TYPE_OFFSET_CONTROLLER);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosOffsetFavoritesController,
+ photos_offset_favorites_controller,
+ PHOTOS_TYPE_OFFSET_CONTROLLER);
static PhotosQuery *
@@ -92,9 +94,7 @@ photos_offset_favorites_controller_init (PhotosOffsetFavoritesController *self)
{
PhotosOffsetFavoritesControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_OFFSET_FAVORITES_CONTROLLER,
- PhotosOffsetFavoritesControllerPrivate);
+ self->priv = photos_offset_favorites_controller_get_instance_private (self);
priv = self->priv;
priv->col_mngr = photos_collection_manager_new ();
@@ -110,8 +110,6 @@ photos_offset_favorites_controller_class_init (PhotosOffsetFavoritesControllerCl
object_class->constructor = photos_offset_favorites_controller_constructor;
object_class->dispose = photos_offset_favorites_controller_dispose;
offset_controller_class->get_query = photos_offset_favorites_controller_get_query;
-
- g_type_class_add_private (class, sizeof (PhotosOffsetFavoritesControllerPrivate));
}
diff --git a/src/photos-organize-collection-dialog.c b/src/photos-organize-collection-dialog.c
index ae28b86..db6aa7c 100644
--- a/src/photos-organize-collection-dialog.c
+++ b/src/photos-organize-collection-dialog.c
@@ -37,7 +37,7 @@ struct _PhotosOrganizeCollectionDialogPrivate
};
-G_DEFINE_TYPE (PhotosOrganizeCollectionDialog, photos_organize_collection_dialog, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosOrganizeCollectionDialog, photos_organize_collection_dialog,
GTK_TYPE_DIALOG);
static gboolean
@@ -70,9 +70,7 @@ photos_organize_collection_dialog_init (PhotosOrganizeCollectionDialog *self)
GtkWidget *ok_button;
GtkWidget *sw;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_ORGANIZE_COLLECTION_DIALOG,
- PhotosOrganizeCollectionDialogPrivate);
+ self->priv = photos_organize_collection_dialog_get_instance_private (self);
priv = self->priv;
gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT);
@@ -113,8 +111,6 @@ photos_organize_collection_dialog_class_init (PhotosOrganizeCollectionDialogClas
GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (class);
dialog_class->response = photos_organize_collection_dialog_response;
-
- g_type_class_add_private (class, sizeof (PhotosOrganizeCollectionDialogPrivate));
}
diff --git a/src/photos-organize-collection-model.c b/src/photos-organize-collection-model.c
index e153242..9969c20 100644
--- a/src/photos-organize-collection-model.c
+++ b/src/photos-organize-collection-model.c
@@ -39,7 +39,7 @@ struct _PhotosOrganizeCollectionModelPrivate
};
-G_DEFINE_TYPE (PhotosOrganizeCollectionModel, photos_organize_collection_model, GTK_TYPE_LIST_STORE);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosOrganizeCollectionModel, photos_organize_collection_model,
GTK_TYPE_LIST_STORE);
static gboolean
@@ -198,9 +198,7 @@ photos_organize_collection_model_init (PhotosOrganizeCollectionModel *self)
G_TYPE_STRING, /* NAME */
G_TYPE_INT}; /* STATE */
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_ORGANIZE_COLLECTION_MODEL,
- PhotosOrganizeCollectionModelPrivate);
+ self->priv = photos_organize_collection_model_get_instance_private (self);
priv = self->priv;
gtk_list_store_set_column_types (GTK_LIST_STORE (self), sizeof (columns) / sizeof (columns[0]), columns);
@@ -230,8 +228,6 @@ photos_organize_collection_model_class_init (PhotosOrganizeCollectionModelClass
object_class->dispose = photos_organize_collection_model_dispose;
object_class->finalize = photos_organize_collection_model_finalize;
-
- g_type_class_add_private (class, sizeof (PhotosOrganizeCollectionModelPrivate));
}
diff --git a/src/photos-organize-collection-view.c b/src/photos-organize-collection-view.c
index 221ffa8..7ea696e 100644
--- a/src/photos-organize-collection-view.c
+++ b/src/photos-organize-collection-view.c
@@ -52,7 +52,7 @@ struct _PhotosOrganizeCollectionViewPrivate
};
-G_DEFINE_TYPE (PhotosOrganizeCollectionView, photos_organize_collection_view, GTK_TYPE_TREE_VIEW);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosOrganizeCollectionView, photos_organize_collection_view,
GTK_TYPE_TREE_VIEW);
static void
@@ -285,9 +285,7 @@ photos_organize_collection_view_init (PhotosOrganizeCollectionView *self)
{
PhotosOrganizeCollectionViewPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_ORGANIZE_COLLECTION_VIEW,
- PhotosOrganizeCollectionViewPrivate);
+ self->priv = photos_organize_collection_view_get_instance_private (self);
priv = self->priv;
priv->model = photos_organize_collection_model_new ();
@@ -343,8 +341,6 @@ photos_organize_collection_view_class_init (PhotosOrganizeCollectionViewClass *c
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = photos_organize_collection_view_dispose;
-
- g_type_class_add_private (class, sizeof (PhotosOrganizeCollectionViewPrivate));
}
diff --git a/src/photos-preview-nav-buttons.c b/src/photos-preview-nav-buttons.c
index 40e2918..7bc2309 100644
--- a/src/photos-preview-nav-buttons.c
+++ b/src/photos-preview-nav-buttons.c
@@ -56,7 +56,7 @@ enum
};
-G_DEFINE_TYPE (PhotosPreviewNavButtons, photos_preview_nav_buttons, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosPreviewNavButtons, photos_preview_nav_buttons, G_TYPE_OBJECT);
static void
@@ -363,7 +363,7 @@ photos_preview_nav_buttons_init (PhotosPreviewNavButtons *self)
{
PhotosPreviewNavButtonsPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_PREVIEW_NAV_BUTTONS,
PhotosPreviewNavButtonsPrivate);
+ self->priv = photos_preview_nav_buttons_get_instance_private (self);
priv = self->priv;
priv->item_mngr = photos_item_manager_new ();
@@ -395,8 +395,6 @@ photos_preview_nav_buttons_class_init (PhotosPreviewNavButtonsClass *class)
"The widget used for showing the preview",
PHOTOS_TYPE_PREVIEW_VIEW,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosPreviewNavButtonsPrivate));
}
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index df9ce94..dfe5a30 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -51,7 +51,7 @@ enum
};
-G_DEFINE_TYPE (PhotosPreviewView, photos_preview_view, GTK_TYPE_SCROLLED_WINDOW);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosPreviewView, photos_preview_view, GTK_TYPE_SCROLLED_WINDOW);
static void
@@ -185,7 +185,7 @@ photos_preview_view_init (PhotosPreviewView *self)
PhotosPreviewViewPrivate *priv;
GtkStyleContext *context;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_PREVIEW_VIEW, PhotosPreviewViewPrivate);
+ self->priv = photos_preview_view_get_instance_private (self);
priv = self->priv;
priv->mode_cntrlr = photos_mode_controller_new ();
@@ -231,8 +231,6 @@ photos_preview_view_class_init (PhotosPreviewViewClass *class)
"The stack overlay widget",
GTK_TYPE_OVERLAY,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosPreviewViewPrivate));
}
diff --git a/src/photos-print-operation.c b/src/photos-print-operation.c
index db0fddc..fc83c5b 100644
--- a/src/photos-print-operation.c
+++ b/src/photos-print-operation.c
@@ -54,7 +54,7 @@ enum
};
-G_DEFINE_TYPE (PhotosPrintOperation, photos_print_operation, GTK_TYPE_PRINT_OPERATION);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosPrintOperation, photos_print_operation, GTK_TYPE_PRINT_OPERATION);
static void
@@ -255,9 +255,7 @@ photos_print_operation_init (PhotosPrintOperation *self)
PhotosPrintOperationPrivate *priv;
GtkPrintSettings *settings;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_PRINT_OPERATION,
- PhotosPrintOperationPrivate);
+ self->priv = photos_print_operation_get_instance_private (self);
priv = self->priv;
priv->unit = GTK_UNIT_INCH;
@@ -305,8 +303,6 @@ photos_print_operation_class_init (PhotosPrintOperationClass *class)
"The node corresponding to the item",
GEGL_TYPE_NODE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosPrintOperationPrivate));
}
diff --git a/src/photos-print-preview.c b/src/photos-print-preview.c
index 31f6095..10815b5 100644
--- a/src/photos-print-preview.c
+++ b/src/photos-print-preview.c
@@ -30,9 +30,6 @@
#include "photos-print-preview.h"
-G_DEFINE_TYPE (PhotosPrintPreview, photos_print_preview, GTK_TYPE_ASPECT_FRAME);
-
-
struct _PhotosPrintPreviewPrivate {
GtkWidget *area;
GdkPixbuf *pixbuf;
@@ -76,6 +73,10 @@ struct _PhotosPrintPreviewPrivate {
gdouble r_dx, r_dy;
};
+
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosPrintPreview, photos_print_preview, GTK_TYPE_ASPECT_FRAME);
+
+
/* Signal IDs */
enum {
SIGNAL_PIXBUF_MOVED,
@@ -404,8 +405,6 @@ photos_print_preview_class_init (PhotosPrintPreviewClass *klass)
G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE,
0, NULL);
-
- g_type_class_add_private (klass, sizeof (PhotosPrintPreviewPrivate));
}
static void
@@ -439,9 +438,7 @@ photos_print_preview_init (PhotosPrintPreview *preview)
PhotosPrintPreviewPrivate *priv;
gfloat ratio;
- preview->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview,
- PHOTOS_TYPE_PRINT_PREVIEW,
- PhotosPrintPreviewPrivate);
+ preview->priv = photos_print_preview_get_instance_private (preview);
priv = preview->priv;
priv->area = GTK_WIDGET (gtk_drawing_area_new ());
diff --git a/src/photos-print-setup.c b/src/photos-print-setup.c
index 627cc3b..17edb06 100644
--- a/src/photos-print-setup.c
+++ b/src/photos-print-setup.c
@@ -64,7 +64,7 @@ enum
};
-G_DEFINE_TYPE (PhotosPrintSetup, photos_print_setup, GTK_TYPE_GRID);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosPrintSetup, photos_print_setup, GTK_TYPE_GRID);
enum
@@ -881,9 +881,7 @@ photos_print_setup_init (PhotosPrintSetup *self)
gchar *locale_scale = NULL;
#endif
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_PRINT_SETUP,
- PhotosPrintSetupPrivate);
+ self->priv = photos_print_setup_get_instance_private (self);
priv = self->priv;
gtk_container_set_border_width (GTK_CONTAINER (self), 12);
@@ -1004,8 +1002,6 @@ photos_print_setup_class_init (PhotosPrintSetupClass *class)
"printed",
GTK_TYPE_PAGE_SETUP,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosPrintSetupPrivate));
}
diff --git a/src/photos-properties-dialog.c b/src/photos-properties-dialog.c
index 47607ef..6cff642 100644
--- a/src/photos-properties-dialog.c
+++ b/src/photos-properties-dialog.c
@@ -52,7 +52,7 @@ enum
};
-G_DEFINE_TYPE (PhotosPropertiesDialog, photos_properties_dialog, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosPropertiesDialog, photos_properties_dialog, GTK_TYPE_DIALOG);
enum
@@ -343,9 +343,7 @@ photos_properties_dialog_init (PhotosPropertiesDialog *self)
{
PhotosPropertiesDialogPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_PROPERTIES_DIALOG,
- PhotosPropertiesDialogPrivate);
+ self->priv = photos_properties_dialog_get_instance_private (self);
priv = self->priv;
priv->item_mngr = photos_item_manager_new ();
@@ -371,8 +369,6 @@ photos_properties_dialog_class_init (PhotosPropertiesDialogClass *class)
"An unique ID associated with this item",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosPropertiesDialogPrivate));
}
diff --git a/src/photos-remote-display-manager.c b/src/photos-remote-display-manager.c
index 29a25df..22e1913 100644
--- a/src/photos-remote-display-manager.c
+++ b/src/photos-remote-display-manager.c
@@ -50,7 +50,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
static GObject *remote_display_manager_singleton = NULL;
-G_DEFINE_TYPE (PhotosRemoteDisplayManager, photos_remote_display_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosRemoteDisplayManager, photos_remote_display_manager, G_TYPE_OBJECT);
static Share *
@@ -123,8 +123,7 @@ photos_remote_display_manager_init (PhotosRemoteDisplayManager *self)
{
PhotosRemoteDisplayManagerPrivate *priv;
- self->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_REMOTE_DISPLAY_MANAGER,
- PhotosRemoteDisplayManagerPrivate);
+ self->priv = priv = photos_remote_display_manager_get_instance_private (self);
/* Keep a connection to the renderers manager alive to keep the list of
* renderers up-to-date */
@@ -160,8 +159,6 @@ photos_remote_display_manager_class_init (PhotosRemoteDisplayManagerClass *class
PHOTOS_TYPE_DLNA_RENDERER,
PHOTOS_TYPE_BASE_ITEM,
G_TYPE_ERROR);
-
- g_type_class_add_private (class, sizeof (PhotosRemoteDisplayManagerPrivate));
}
@@ -176,18 +173,18 @@ photos_remote_display_manager_share_cb (GObject *source_object,
GError *error = NULL;
item = photos_dlna_renderer_share_finish (renderer, res, &error);
+ g_object_unref (item); /* We already hold a ref to the item to be shared */
if (error != NULL)
{
g_warning ("Unable to remotely display item '%s': %s",
- share->item != NULL ? photos_base_item_get_id (share->item) : "(none)",
+ item != NULL ? photos_base_item_get_id (item) : "(none)",
error->message);
g_signal_emit (share->manager, signals[SHARE_ERROR], 0, share->renderer, share->item, error);
g_error_free (error);
goto out;
}
- g_object_unref (item); /* We already hold a ref to the item to be shared */
g_signal_emit (share->manager, signals[SHARE_BEGAN], 0, share->renderer, share->item);
out:
diff --git a/src/photos-search-type.c b/src/photos-search-type.c
index f7cb027..633e138 100644
--- a/src/photos-search-type.c
+++ b/src/photos-search-type.c
@@ -50,6 +50,7 @@ static void photos_filterable_interface_init (PhotosFilterableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (PhotosSearchType, photos_search_type, G_TYPE_OBJECT,
+ G_ADD_PRIVATE (PhotosSearchType)
G_IMPLEMENT_INTERFACE (PHOTOS_TYPE_FILTERABLE,
photos_filterable_interface_init));
@@ -145,7 +146,7 @@ photos_search_type_set_property (GObject *object, guint prop_id, const GValue *v
static void
photos_search_type_init (PhotosSearchType *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SEARCH_TYPE, PhotosSearchTypePrivate);
+ self->priv = photos_search_type_get_instance_private (self);
}
@@ -189,8 +190,6 @@ photos_search_type_class_init (PhotosSearchTypeClass *class)
"",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosSearchTypePrivate));
}
diff --git a/src/photos-selection-controller.c b/src/photos-selection-controller.c
index 55fb2d4..05d8914 100644
--- a/src/photos-selection-controller.c
+++ b/src/photos-selection-controller.c
@@ -49,7 +49,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PhotosSelectionController, photos_selection_controller, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosSelectionController, photos_selection_controller, G_TYPE_OBJECT);
static void
@@ -128,9 +128,7 @@ photos_selection_controller_init (PhotosSelectionController *self)
{
PhotosSelectionControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_SELECTION_CONTROLLER,
- PhotosSelectionControllerPrivate);
+ self->priv = photos_selection_controller_get_instance_private (self);
priv = self->priv;
priv->item_mngr = photos_item_manager_new ();
@@ -172,8 +170,6 @@ photos_selection_controller_class_init (PhotosSelectionControllerClass *class)
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
-
- g_type_class_add_private (class, sizeof (PhotosSelectionControllerPrivate));
}
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 2158fdb..5629b0f 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -57,7 +57,7 @@ struct _PhotosSelectionToolbarPrivate
gboolean inside_refresh;
};
-G_DEFINE_TYPE (PhotosSelectionToolbar, photos_selection_toolbar, GTK_TYPE_TOOLBAR);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosSelectionToolbar, photos_selection_toolbar, GTK_TYPE_TOOLBAR);
enum
@@ -438,7 +438,7 @@ photos_selection_toolbar_init (PhotosSelectionToolbar *self)
GtkWidget *image;
GtkStyleContext *context;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SELECTION_TOOLBAR,
PhotosSelectionToolbarPrivate);
+ self->priv = photos_selection_toolbar_get_instance_private (self);
priv = self->priv;
priv->item_listeners = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref);
@@ -556,8 +556,6 @@ photos_selection_toolbar_class_init (PhotosSelectionToolbarClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = photos_selection_toolbar_dispose;
-
- g_type_class_add_private (class, sizeof (PhotosSelectionToolbarPrivate));
}
diff --git a/src/photos-set-collection-job.c b/src/photos-set-collection-job.c
index a5adfb7..d2043f6 100644
--- a/src/photos-set-collection-job.c
+++ b/src/photos-set-collection-job.c
@@ -55,7 +55,7 @@ enum
};
-G_DEFINE_TYPE (PhotosSetCollectionJob, photos_set_collection_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosSetCollectionJob, photos_set_collection_job, G_TYPE_OBJECT);
static void
@@ -160,7 +160,7 @@ photos_set_collection_job_init (PhotosSetCollectionJob *self)
{
PhotosSetCollectionJobPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SET_COLLECTION_JOB,
PhotosSetCollectionJobPrivate);
+ self->priv = photos_set_collection_job_get_instance_private (self);
priv = self->priv;
priv->sel_cntrlr = photos_selection_controller_new ();
@@ -193,8 +193,6 @@ photos_set_collection_job_class_init (PhotosSetCollectionJobClass *class)
"collection",
FALSE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosSetCollectionJobPrivate));
}
diff --git a/src/photos-single-item-job.c b/src/photos-single-item-job.c
index 44173d8..a52b168 100644
--- a/src/photos-single-item-job.c
+++ b/src/photos-single-item-job.c
@@ -49,7 +49,7 @@ enum
};
-G_DEFINE_TYPE (PhotosSingleItemJob, photos_single_item_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosSingleItemJob, photos_single_item_job, G_TYPE_OBJECT);
static void
@@ -166,7 +166,7 @@ photos_single_item_job_init (PhotosSingleItemJob *self)
{
PhotosSingleItemJobPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SINGLE_ITEM_JOB, PhotosSingleItemJobPrivate);
+ self->priv = photos_single_item_job_get_instance_private (self);
priv = self->priv;
priv->queue = photos_tracker_queue_new ();
@@ -189,8 +189,6 @@ photos_single_item_job_class_init (PhotosSingleItemJobClass *class)
"An unique ID associated with this item",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosSingleItemJobPrivate));
}
diff --git a/src/photos-source-manager.c b/src/photos-source-manager.c
index c74925e..3136523 100644
--- a/src/photos-source-manager.c
+++ b/src/photos-source-manager.c
@@ -39,7 +39,7 @@ struct _PhotosSourceManagerPrivate
};
-G_DEFINE_TYPE (PhotosSourceManager, photos_source_manager, PHOTOS_TYPE_BASE_MANAGER);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosSourceManager, photos_source_manager, PHOTOS_TYPE_BASE_MANAGER);
static void
@@ -145,7 +145,7 @@ photos_source_manager_init (PhotosSourceManager *self)
PhotosSourceManagerPrivate *priv = self->priv;
PhotosSource *source;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SOURCE_MANAGER, PhotosSourceManagerPrivate);
+ self->priv = photos_source_manager_get_instance_private (self);
priv = self->priv;
source = photos_source_new (PHOTOS_SOURCE_STOCK_ALL, _("All"), TRUE);
@@ -185,8 +185,6 @@ photos_source_manager_class_init (PhotosSourceManagerClass *class)
object_class->constructor = photos_source_manager_constructor;
object_class->dispose = photos_source_manager_dispose;
-
- g_type_class_add_private (class, sizeof (PhotosSourceManagerPrivate));
}
diff --git a/src/photos-source.c b/src/photos-source.c
index 4380c1a..34406d3 100644
--- a/src/photos-source.c
+++ b/src/photos-source.c
@@ -54,6 +54,7 @@ static void photos_filterable_interface_init (PhotosFilterableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (PhotosSource, photos_source, G_TYPE_OBJECT,
+ G_ADD_PRIVATE (PhotosSource)
G_IMPLEMENT_INTERFACE (PHOTOS_TYPE_FILTERABLE,
photos_filterable_interface_init));
@@ -192,7 +193,7 @@ photos_source_set_property (GObject *object, guint prop_id, const GValue *value,
static void
photos_source_init (PhotosSource *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SOURCE, PhotosSourcePrivate);
+ self->priv = photos_source_get_instance_private (self);
}
@@ -237,8 +238,6 @@ photos_source_class_init (PhotosSourceClass *class)
"A GOA configured account from which the source was
created",
GOA_TYPE_OBJECT,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-
- g_type_class_add_private (class, sizeof (PhotosSourcePrivate));
}
diff --git a/src/photos-spinner-box.c b/src/photos-spinner-box.c
index 0e82825..02b92de 100644
--- a/src/photos-spinner-box.c
+++ b/src/photos-spinner-box.c
@@ -37,7 +37,7 @@ struct _PhotosSpinnerBoxPrivate
};
-G_DEFINE_TYPE (PhotosSpinnerBox, photos_spinner_box, GTK_TYPE_GRID);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosSpinnerBox, photos_spinner_box, GTK_TYPE_GRID);
static void
@@ -81,7 +81,7 @@ photos_spinner_box_constructed (GObject *object)
static void
photos_spinner_box_init (PhotosSpinnerBox *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SPINNER_BOX, PhotosSpinnerBoxPrivate);
+ self->priv = photos_spinner_box_get_instance_private (self);
}
@@ -91,8 +91,6 @@ photos_spinner_box_class_init (PhotosSpinnerBoxClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->constructed = photos_spinner_box_constructed;
-
- g_type_class_add_private (class, sizeof (PhotosSpinnerBoxPrivate));
}
diff --git a/src/photos-tracker-change-monitor.c b/src/photos-tracker-change-monitor.c
index dd68dd2..99c3f3e 100644
--- a/src/photos-tracker-change-monitor.c
+++ b/src/photos-tracker-change-monitor.c
@@ -52,7 +52,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (PhotosTrackerChangeMonitor, photos_tracker_change_monitor, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosTrackerChangeMonitor, photos_tracker_change_monitor, G_TYPE_OBJECT);
typedef struct _PhotosTrackerChangeMonitorQueryData PhotosTrackerChangeMonitorQueryData;
@@ -295,9 +295,7 @@ photos_tracker_change_monitor_init (PhotosTrackerChangeMonitor *self)
{
PhotosTrackerChangeMonitorPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_TRACKER_CHANGE_MONITOR,
- PhotosTrackerChangeMonitorPrivate);
+ self->priv = photos_tracker_change_monitor_get_instance_private (self);
priv = self->priv;
priv->pending = g_hash_table_new_full (g_str_hash,
@@ -337,8 +335,6 @@ photos_tracker_change_monitor_class_init (PhotosTrackerChangeMonitorClass *class
G_TYPE_NONE,
1,
G_TYPE_HASH_TABLE);
-
- g_type_class_add_private (class, sizeof (PhotosTrackerChangeMonitorPrivate));
}
diff --git a/src/photos-tracker-collections-controller.c b/src/photos-tracker-collections-controller.c
index 631dbdb..e0adb06 100644
--- a/src/photos-tracker-collections-controller.c
+++ b/src/photos-tracker-collections-controller.c
@@ -33,9 +33,9 @@ struct _PhotosTrackerCollectionsControllerPrivate
};
-G_DEFINE_TYPE (PhotosTrackerCollectionsController,
- photos_tracker_collections_controller,
- PHOTOS_TYPE_TRACKER_CONTROLLER);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosTrackerCollectionsController,
+ photos_tracker_collections_controller,
+ PHOTOS_TYPE_TRACKER_CONTROLLER);
static PhotosOffsetController *
@@ -98,9 +98,7 @@ photos_tracker_collections_controller_init (PhotosTrackerCollectionsController *
{
PhotosTrackerCollectionsControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_TRACKER_COLLECTIONS_CONTROLLER,
- PhotosTrackerCollectionsControllerPrivate);
+ self->priv = photos_tracker_collections_controller_get_instance_private (self);
priv = self->priv;
priv->col_mngr = photos_collection_manager_new ();
@@ -117,8 +115,6 @@ photos_tracker_collections_controller_class_init (PhotosTrackerCollectionsContro
object_class->dispose = photos_tracker_collections_controller_dispose;
tracker_controller_class->get_offset_controller =
photos_tracker_collections_controller_get_offset_controller;
tracker_controller_class->get_query = photos_tracker_collections_controller_get_query;
-
- g_type_class_add_private (class, sizeof (PhotosTrackerCollectionsControllerPrivate));
}
diff --git a/src/photos-tracker-controller.c b/src/photos-tracker-controller.c
index a818e24..e94d76b 100644
--- a/src/photos-tracker-controller.c
+++ b/src/photos-tracker-controller.c
@@ -63,7 +63,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_ABSTRACT_TYPE (PhotosTrackerController, photos_tracker_controller, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (PhotosTrackerController, photos_tracker_controller, G_TYPE_OBJECT);
typedef enum
@@ -307,7 +307,7 @@ photos_tracker_controller_init (PhotosTrackerController *self)
{
PhotosTrackerControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_TRACKER_CONTROLLER,
PhotosTrackerControllerPrivate);
+ self->priv = photos_tracker_controller_get_instance_private (self);
priv = self->priv;
priv->cancellable = g_cancellable_new ();
@@ -370,8 +370,6 @@ photos_tracker_controller_class_init (PhotosTrackerControllerClass *class)
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
-
- g_type_class_add_private (class, sizeof (PhotosTrackerControllerPrivate));
}
diff --git a/src/photos-tracker-favorites-controller.c b/src/photos-tracker-favorites-controller.c
index b8958b0..c6c0d79 100644
--- a/src/photos-tracker-favorites-controller.c
+++ b/src/photos-tracker-favorites-controller.c
@@ -33,9 +33,9 @@ struct _PhotosTrackerFavoritesControllerPrivate
};
-G_DEFINE_TYPE (PhotosTrackerFavoritesController,
- photos_tracker_favorites_controller,
- PHOTOS_TYPE_TRACKER_CONTROLLER);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosTrackerFavoritesController,
+ photos_tracker_favorites_controller,
+ PHOTOS_TYPE_TRACKER_CONTROLLER);
static PhotosOffsetController *
@@ -98,9 +98,7 @@ photos_tracker_favorites_controller_init (PhotosTrackerFavoritesController *self
{
PhotosTrackerFavoritesControllerPrivate *priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_TRACKER_FAVORITES_CONTROLLER,
- PhotosTrackerFavoritesControllerPrivate);
+ self->priv = photos_tracker_favorites_controller_get_instance_private (self);
priv = self->priv;
priv->col_mngr = photos_collection_manager_new ();
@@ -117,8 +115,6 @@ photos_tracker_favorites_controller_class_init (PhotosTrackerFavoritesController
object_class->dispose = photos_tracker_favorites_controller_dispose;
tracker_controller_class->get_offset_controller =
photos_tracker_favorites_controller_get_offset_controller;
tracker_controller_class->get_query = photos_tracker_favorites_controller_get_query;
-
- g_type_class_add_private (class, sizeof (PhotosTrackerFavoritesControllerPrivate));
}
diff --git a/src/photos-tracker-queue.c b/src/photos-tracker-queue.c
index 09a2b93..709ebbc 100644
--- a/src/photos-tracker-queue.c
+++ b/src/photos-tracker-queue.c
@@ -39,7 +39,7 @@ struct _PhotosTrackerQueuePrivate
};
-G_DEFINE_TYPE (PhotosTrackerQueue, photos_tracker_queue, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosTrackerQueue, photos_tracker_queue, G_TYPE_OBJECT);
typedef enum
@@ -211,7 +211,7 @@ photos_tracker_queue_init (PhotosTrackerQueue *self)
PhotosTrackerQueuePrivate *priv = self->priv;
GError *error;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_TRACKER_QUEUE, PhotosTrackerQueuePrivate);
+ self->priv = photos_tracker_queue_get_instance_private (self);
priv = self->priv;
priv->queue = g_queue_new ();
@@ -235,8 +235,6 @@ photos_tracker_queue_class_init (PhotosTrackerQueueClass *class)
object_class->constructor = photos_tracker_queue_constructor;
object_class->dispose = photos_tracker_queue_dispose;
object_class->finalize = photos_tracker_queue_finalize;
-
- g_type_class_add_private (class, sizeof (PhotosTrackerQueuePrivate));
}
diff --git a/src/photos-update-mtime-job.c b/src/photos-update-mtime-job.c
index a709572..029a932 100644
--- a/src/photos-update-mtime-job.c
+++ b/src/photos-update-mtime-job.c
@@ -49,7 +49,7 @@ enum
};
-G_DEFINE_TYPE (PhotosUpdateMtimeJob, photos_update_mtime_job, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosUpdateMtimeJob, photos_update_mtime_job, G_TYPE_OBJECT);
static void
@@ -121,7 +121,7 @@ photos_update_mtime_job_init (PhotosUpdateMtimeJob *self)
{
PhotosUpdateMtimeJobPrivate *priv = self->priv;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_UPDATE_MTIME_JOB, PhotosUpdateMtimeJobPrivate);
+ self->priv = photos_update_mtime_job_get_instance_private (self);
priv = self->priv;
priv->queue = photos_tracker_queue_new ();
@@ -144,8 +144,6 @@ photos_update_mtime_job_class_init (PhotosUpdateMtimeJobClass *class)
"An unique ID associated with this item",
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosUpdateMtimeJobPrivate));
}
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 72e480f..859e43f 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -62,7 +62,7 @@ enum
};
-G_DEFINE_TYPE (PhotosViewContainer, photos_view_container, GTK_TYPE_GRID);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosViewContainer, photos_view_container, GTK_TYPE_GRID);
static void
@@ -387,9 +387,7 @@ photos_view_container_set_property (GObject *object, guint prop_id, const GValue
static void
photos_view_container_init (PhotosViewContainer *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- PHOTOS_TYPE_VIEW_CONTAINER,
- PhotosViewContainerPrivate);
+ self->priv = photos_view_container_get_instance_private (self);
}
@@ -411,8 +409,6 @@ photos_view_container_class_init (PhotosViewContainerClass *class)
PHOTOS_TYPE_WINDOW_MODE,
PHOTOS_WINDOW_MODE_NONE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosViewContainerPrivate));
}
diff --git a/src/photos-view-model.c b/src/photos-view-model.c
index 0d43c14..ddf75da 100644
--- a/src/photos-view-model.c
+++ b/src/photos-view-model.c
@@ -46,7 +46,7 @@ enum
};
-G_DEFINE_TYPE (PhotosViewModel, photos_view_model, GTK_TYPE_LIST_STORE);
+G_DEFINE_TYPE_WITH_PRIVATE (PhotosViewModel, photos_view_model, GTK_TYPE_LIST_STORE);
static void
@@ -246,7 +246,7 @@ photos_view_model_init (PhotosViewModel *self)
G_TYPE_INT64, /* MTIME */
G_TYPE_BOOLEAN}; /* STATE */
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_VIEW_MODEL, PhotosViewModelPrivate);
+ self->priv = photos_view_model_get_instance_private (self);
priv = self->priv;
gtk_list_store_set_column_types (GTK_LIST_STORE (self), sizeof (columns) / sizeof (columns[0]), columns);
@@ -278,8 +278,6 @@ photos_view_model_class_init (PhotosViewModelClass *class)
PHOTOS_TYPE_WINDOW_MODE,
PHOTOS_WINDOW_MODE_NONE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-
- g_type_class_add_private (class, sizeof (PhotosViewModelPrivate));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
