[Xfce4-commits] [xfce/tumbler] 01/01: Fix g_type_class_add_private is deprecated
noreply at xfce.org
noreply at xfce.org
Wed Apr 17 04:13:37 CEST 2019
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/tumbler.
commit c0b1f495994b529531655a3c10df108727b8f1b4
Author: Andre Miranda <andreldm at xfce.org>
Date: Tue Apr 16 23:13:31 2019 -0300
Fix g_type_class_add_private is deprecated
---
tumbler/tumbler-abstract-thumbnailer.c | 11 +++--------
tumblerd/tumbler-component.c | 10 ++--------
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/tumbler/tumbler-abstract-thumbnailer.c b/tumbler/tumbler-abstract-thumbnailer.c
index 0bb2649..f0db13a 100644
--- a/tumbler/tumbler-abstract-thumbnailer.c
+++ b/tumbler/tumbler-abstract-thumbnailer.c
@@ -31,10 +31,6 @@
-#define TUMBLER_ABSTRACT_THUMBNAILER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TUMBLER_TYPE_ABSTRACT_THUMBNAILER, TumblerAbstractThumbnailerPrivate))
-
-
-
/* Property identifiers */
enum
{
@@ -83,7 +79,8 @@ G_DEFINE_TYPE_EXTENDED (TumblerAbstractThumbnailer,
G_TYPE_OBJECT,
G_TYPE_FLAG_ABSTRACT,
G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_THUMBNAILER,
- tumbler_abstract_thumbnailer_thumbnailer_init));
+ tumbler_abstract_thumbnailer_thumbnailer_init)
+ G_ADD_PRIVATE (TumblerAbstractThumbnailer));
@@ -92,8 +89,6 @@ tumbler_abstract_thumbnailer_class_init (TumblerAbstractThumbnailerClass *klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (TumblerAbstractThumbnailerPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->constructed = tumbler_abstract_thumbnailer_constructed;
gobject_class->finalize = tumbler_abstract_thumbnailer_finalize;
@@ -121,7 +116,7 @@ tumbler_abstract_thumbnailer_thumbnailer_init (TumblerThumbnailerIface *iface)
static void
tumbler_abstract_thumbnailer_init (TumblerAbstractThumbnailer *thumbnailer)
{
- thumbnailer->priv = TUMBLER_ABSTRACT_THUMBNAILER_GET_PRIVATE (thumbnailer);
+ thumbnailer->priv = tumbler_abstract_thumbnailer_get_instance_private (thumbnailer);
}
diff --git a/tumblerd/tumbler-component.c b/tumblerd/tumbler-component.c
index fdb0062..7637e6b 100644
--- a/tumblerd/tumbler-component.c
+++ b/tumblerd/tumbler-component.c
@@ -30,10 +30,6 @@
-#define TUMBLER_COMPONENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TUMBLER_TYPE_COMPONENT, TumblerComponentPrivate))
-
-
-
/* property identifiers */
enum
{
@@ -62,7 +58,7 @@ struct _TumblerComponentPrivate
-G_DEFINE_TYPE (TumblerComponent, tumbler_component, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (TumblerComponent, tumbler_component, G_TYPE_OBJECT)
@@ -71,8 +67,6 @@ tumbler_component_class_init (TumblerComponentClass *klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (TumblerComponentPrivate));
-
/* Determine the parent type class */
tumbler_component_parent_class = g_type_class_peek_parent (klass);
@@ -96,7 +90,7 @@ tumbler_component_class_init (TumblerComponentClass *klass)
static void
tumbler_component_init (TumblerComponent *component)
{
- component->priv = TUMBLER_COMPONENT_GET_PRIVATE (component);
+ component->priv = tumbler_component_get_instance_private (component);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list