rework deprecated g_type_class_add_private()

g_type_class_add_private() is deprecated in glib2 since 2.58.

Use G_ADD_PRIVATE() macro with the G_DEFINE_* family of macros instead.

Change-Id: Ie22c3603a9a3254e35b6e29965c14877f27d2aad
Signed-off-by: Adrian Szyndela <adrian.s@samsung.com>

diff --git a/configure.ac b/configure.ac
index 50733bb..ca7ae70 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ LT_INIT([disable-static])
 
 # Checks for libraries.
 PKG_CHECK_MODULES([GLIB], 
-                  [glib-2.0 >= 2.30
+                  [glib-2.0 >= 2.38
                    gio-2.0
                    gio-unix-2.0
                    gmodule-2.0])

diff --git a/dists/rpm/gum-suse.spec b/dists/rpm/gum-suse.spec
index 56b4ad1..2fad35c 100644 (file)
--- a/dists/rpm/gum-suse.spec
+++ b/dists/rpm/gum-suse.spec
@@ -22,7 +22,7 @@ Requires(postun): /sbin/ldconfig
 BuildRequires: pkgconfig(systemd)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(gtk-doc)
-BuildRequires: pkgconfig(glib-2.0) >= 2.30
+BuildRequires: pkgconfig(glib-2.0) >= 2.38
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gio-unix-2.0)

diff --git a/dists/rpm/tizen/packaging/gumd.spec b/dists/rpm/tizen/packaging/gumd.spec
index aa0a58d..94af359 100644 (file)
--- a/dists/rpm/tizen/packaging/gumd.spec
+++ b/dists/rpm/tizen/packaging/gumd.spec
@@ -24,7 +24,7 @@ Requires(postun): /sbin/ldconfig
 BuildRequires: pkgconfig(systemd)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(gtk-doc)
-BuildRequires: pkgconfig(glib-2.0) >= 2.30
+BuildRequires: pkgconfig(glib-2.0) >= 2.38
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gio-unix-2.0)

diff --git a/packaging/gumd.spec b/packaging/gumd.spec
index 9cabda1..6fa647f 100644 (file)
--- a/packaging/gumd.spec
+++ b/packaging/gumd.spec
@@ -28,7 +28,7 @@ Requires(postun): /sbin/ldconfig
 BuildRequires: pkgconfig(systemd)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(gtk-doc)
-BuildRequires: pkgconfig(glib-2.0) >= 2.30
+BuildRequires: pkgconfig(glib-2.0) >= 2.38
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gio-unix-2.0)

diff --git a/src/common/gum-config.c b/src/common/gum-config.c
index 0c4e7a7..d656a1a 100755 (executable)
--- a/src/common/gum-config.c
+++ b/src/common/gum-config.c
@@ -104,10 +104,7 @@ struct _GumConfigPrivate
     gchar *sysroot;
 };
 
-#define GUM_CONFIG_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUM_TYPE_CONFIG, GumConfigPrivate)
-
-G_DEFINE_TYPE (GumConfig, gum_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GumConfig, gum_config, G_TYPE_OBJECT);
 
 #define SYS_UID_MIN  100
 #define SYS_UID_MAX  499
@@ -683,7 +680,7 @@ static void
 gum_config_init (
         GumConfig *self)
 {
-    self->priv = GUM_CONFIG_PRIV (self);
+    self->priv = gum_config_get_instance_private (self);
 
     self->priv->config_file_path = NULL;
     self->priv->config_table = gum_dictionary_new ();
@@ -694,7 +691,6 @@ gum_config_class_init (
         GumConfigClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
-    g_type_class_add_private (object_class, sizeof (GumConfigPrivate));
 
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;

diff --git a/src/common/gum-disposable.c b/src/common/gum-disposable.c
index c6c3001..90f428f 100644 (file)
--- a/src/common/gum-disposable.c
+++ b/src/common/gum-disposable.c
@@ -112,10 +112,7 @@ enum {
 static GParamSpec *properties[PROP_MAX];
 static guint       signals[SIG_MAX];
 
-#define GUM_DISPOSABLE_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUM_TYPE_DISPOSABLE, GumDisposablePrivate)
-
-G_DEFINE_ABSTRACT_TYPE (GumDisposable, gum_disposable, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GumDisposable, gum_disposable, G_TYPE_OBJECT);
 
 static void
 _set_property (
@@ -201,8 +198,6 @@ gum_disposable_class_init (
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumDisposablePrivate));
-
     object_class->set_property = _set_property;
     object_class->get_property = _get_property;
     object_class->dispose = _dispose;
@@ -274,7 +269,7 @@ static void
 gum_disposable_init (
         GumDisposable *self)
 {
-    self->priv = GUM_DISPOSABLE_PRIV (self);
+    self->priv = gum_disposable_get_instance_private (self);
 
     self->priv->timer_id = 0;
     self->priv->timeout = 0;

diff --git a/src/daemon/core/gumd-daemon-group.c b/src/daemon/core/gumd-daemon-group.c
index 4b500c9..6f29702 100644 (file)
--- a/src/daemon/core/gumd-daemon-group.c
+++ b/src/daemon/core/gumd-daemon-group.c
@@ -57,10 +57,7 @@ struct _GumdDaemonGroupPrivate
     struct sgrp *gshadow;
 };
 
-G_DEFINE_TYPE (GumdDaemonGroup, gumd_daemon_group, G_TYPE_OBJECT)
-
-#define GUMD_DAEMON_GROUP_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUMD_TYPE_DAEMON_GROUP, GumdDaemonGroupPrivate)
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDaemonGroup, gumd_daemon_group, G_TYPE_OBJECT)
 
 enum
 {
@@ -282,7 +279,7 @@ static void
 gumd_daemon_group_init (
         GumdDaemonGroup *self)
 {
-    self->priv = GUMD_DAEMON_GROUP_PRIV(self);
+    self->priv = gumd_daemon_group_get_instance_private (self);
     self->priv->config = NULL;
     self->priv->group = g_malloc0 (sizeof (struct group));
     self->priv->group->gr_gid = G_MAXUINT;
@@ -295,8 +292,6 @@ gumd_daemon_group_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumdDaemonGroupPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;

diff --git a/src/daemon/core/gumd-daemon-user.c b/src/daemon/core/gumd-daemon-user.c
index 0681329..29d31cc 100755 (executable)
--- a/src/daemon/core/gumd-daemon-user.c
+++ b/src/daemon/core/gumd-daemon-user.c
@@ -76,10 +76,7 @@ struct _GumdDaemonUserPrivate
     struct _userinfo *info;
 };
 
-G_DEFINE_TYPE (GumdDaemonUser, gumd_daemon_user, G_TYPE_OBJECT)
-
-#define GUMD_DAEMON_USER_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUMD_TYPE_DAEMON_USER, GumdDaemonUserPrivate)
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDaemonUser, gumd_daemon_user, G_TYPE_OBJECT)
 
 #define GUMD_DAY (24L*3600L)
 #define GUMD_STR_LEN 4096
@@ -592,7 +589,7 @@ static void
 gumd_daemon_user_init (
         GumdDaemonUser *self)
 {
-    self->priv = GUMD_DAEMON_USER_PRIV (self);
+    self->priv = gumd_daemon_user_get_instance_private (self);
     self->priv->config = NULL;
     self->priv->nick_name = NULL;
     self->priv->pw = g_malloc0 (sizeof (struct passwd));
@@ -608,8 +605,6 @@ gumd_daemon_user_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumdDaemonUserPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;

diff --git a/src/daemon/core/gumd-daemon.c b/src/daemon/core/gumd-daemon.c
index 53a5470..9e62c56 100644 (file)
--- a/src/daemon/core/gumd-daemon.c
+++ b/src/daemon/core/gumd-daemon.c
@@ -36,10 +36,7 @@ struct _GumdDaemonPrivate
     GHashTable *groups;
 };
 
-G_DEFINE_TYPE (GumdDaemon, gumd_daemon, G_TYPE_OBJECT)
-
-#define GUMD_DAEMON_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUMD_TYPE_DAEMON, GumdDaemonPrivate)
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDaemon, gumd_daemon, G_TYPE_OBJECT)
 
 static GObject *self = 0;
 
@@ -159,7 +156,7 @@ static void
 gumd_daemon_init (
         GumdDaemon *self)
 {
-    self->priv = GUMD_DAEMON_PRIV (self);
+    self->priv = gumd_daemon_get_instance_private (self);
     self->priv->config = gum_config_new (NULL);
     self->priv->users = g_hash_table_new_full (g_direct_hash, g_direct_equal,
             NULL, NULL);
@@ -173,8 +170,6 @@ gumd_daemon_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumdDaemonPrivate));
-
     object_class->constructor = _constructor;
     object_class->dispose = _dispose;
     object_class->finalize = _finalize;

diff --git a/src/daemon/dbus/gumd-dbus-group-adapter.c b/src/daemon/dbus/gumd-dbus-group-adapter.c
index a57796d..95b590d 100644 (file)
--- a/src/daemon/dbus/gumd-dbus-group-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-group-adapter.c
@@ -52,13 +52,9 @@ struct _GumdDbusGroupAdapterPrivate
     GumdDaemon *daemon;
 };
 
-G_DEFINE_TYPE (GumdDbusGroupAdapter, gumd_dbus_group_adapter, \
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDbusGroupAdapter, gumd_dbus_group_adapter, \
         GUM_TYPE_DISPOSABLE)
 
-#define GUMD_DBUS_GROUP_ADAPTER_GET_PRIV(obj) \
-    G_TYPE_INSTANCE_GET_PRIVATE ((obj), GUMD_TYPE_GROUP_ADAPTER,\
-            GumdDbusGroupAdapterPrivate)
-
 static void
 _set_property (
         GObject *object,
@@ -149,8 +145,6 @@ gumd_dbus_group_adapter_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumdDbusGroupAdapterPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;
@@ -413,7 +407,7 @@ static void
 gumd_dbus_group_adapter_init (
         GumdDbusGroupAdapter *self)
 {
-    self->priv = GUMD_DBUS_GROUP_ADAPTER_GET_PRIV(self);
+    self->priv = gumd_dbus_group_adapter_get_instance_private (self);
 
     self->priv->connection = NULL;
     self->priv->group = NULL;

diff --git a/src/daemon/dbus/gumd-dbus-group-service-adapter.c b/src/daemon/dbus/gumd-dbus-group-service-adapter.c
index da95288..ec0179b 100755 (executable)
--- a/src/daemon/dbus/gumd-dbus-group-service-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-group-service-adapter.c
@@ -63,13 +63,9 @@ struct _GumdDbusGroupServiceAdapterPrivate
     GHashTable *caller_watchers; //(dbus_caller:watcher_id)
 };
 
-G_DEFINE_TYPE (GumdDbusGroupServiceAdapter, gumd_dbus_group_service_adapter, \
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDbusGroupServiceAdapter, gumd_dbus_group_service_adapter, \
         GUM_TYPE_DISPOSABLE)
 
-#define GUMD_DBUS_GROUP_SERVICE_ADAPTER_GET_PRIV(obj) \
-    G_TYPE_INSTANCE_GET_PRIVATE ((obj), GUMD_TYPE_GROUP_SERVICE_ADAPTER, \
-            GumdDbusGroupServiceAdapterPrivate)
-
 static gboolean
 _handle_create_new_group (
         GumdDbusGroupServiceAdapter *self,
@@ -296,9 +292,6 @@ gumd_dbus_group_service_adapter_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class,
-            sizeof (GumdDbusGroupServiceAdapterPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;
@@ -333,7 +326,7 @@ gumd_dbus_group_service_adapter_class_init (
 static void
 gumd_dbus_group_service_adapter_init (GumdDbusGroupServiceAdapter *self)
 {
-    self->priv = GUMD_DBUS_GROUP_SERVICE_ADAPTER_GET_PRIV(self);
+    self->priv = gumd_dbus_group_service_adapter_get_instance_private (self);
 
     self->priv->connection = 0;
     self->priv->daemon = NULL;

diff --git a/src/daemon/dbus/gumd-dbus-server-msg-bus.c b/src/daemon/dbus/gumd-dbus-server-msg-bus.c
index 807bab2..11ed23e 100755 (executable)
--- a/src/daemon/dbus/gumd-dbus-server-msg-bus.c
+++ b/src/daemon/dbus/gumd-dbus-server-msg-bus.c
@@ -58,11 +58,6 @@ static gboolean
 _gumd_dbus_server_msg_bus_stop (
         GumdDbusServer *self);
 
-G_DEFINE_TYPE_WITH_CODE (GumdDbusServerMsgBus,
-        gumd_dbus_server_msg_bus, G_TYPE_OBJECT,
-        G_IMPLEMENT_INTERFACE (GUMD_TYPE_DBUS_SERVER,
-                _gumd_dbus_server_msg_bus_interface_init));
-
 struct _GumdDbusServerMsgBusPrivate
 {
     GumdDaemon *daemon;
@@ -72,8 +67,11 @@ struct _GumdDbusServerMsgBusPrivate
     GDBusConnection *connection;
 };
 
-#define GUMD_DBUS_SERVER_MSG_BUS_GET_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ( \
-        (obj), GUMD_TYPE_DBUS_SERVER_MSG_BUS, GumdDbusServerMsgBusPrivate)
+G_DEFINE_TYPE_WITH_CODE (GumdDbusServerMsgBus,
+        gumd_dbus_server_msg_bus, G_TYPE_OBJECT,
+        G_IMPLEMENT_INTERFACE (GUMD_TYPE_DBUS_SERVER,
+                _gumd_dbus_server_msg_bus_interface_init)
+        G_ADD_PRIVATE(GumdDbusServerMsgBus));
 
 static gboolean
 _close_server (
@@ -247,9 +245,6 @@ gumd_dbus_server_msg_bus_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class,
-            sizeof (GumdDbusServerMsgBusPrivate));
-
     object_class->set_property = _set_property;
     object_class->get_property = _get_property;
     object_class->dispose = _dispose;
@@ -262,7 +257,7 @@ static void
 gumd_dbus_server_msg_bus_init (
         GumdDbusServerMsgBus *self)
 {
-    self->priv = GUMD_DBUS_SERVER_MSG_BUS_GET_PRIV(self);
+    self->priv = gumd_dbus_server_msg_bus_get_instance_private (self);
     self->priv->daemon = gumd_daemon_new ();
     self->priv->user_service = NULL;
     self->priv->group_service = NULL;

diff --git a/src/daemon/dbus/gumd-dbus-server-p2p.c b/src/daemon/dbus/gumd-dbus-server-p2p.c
index 00f8d68..04e64a3 100755 (executable)
--- a/src/daemon/dbus/gumd-dbus-server-p2p.c
+++ b/src/daemon/dbus/gumd-dbus-server-p2p.c
@@ -80,10 +80,8 @@ _on_connection_closed (
 G_DEFINE_TYPE_WITH_CODE (GumdDbusServerP2P,
         gumd_dbus_server_p2p, G_TYPE_OBJECT,
         G_IMPLEMENT_INTERFACE (GUMD_TYPE_DBUS_SERVER,
-                _gumd_dbus_server_p2p_interface_init));
-
-#define GUMD_DBUS_SERVER_P2P_GET_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj),\
-        GUMD_TYPE_DBUS_SERVER_P2P, GumdDbusServerP2PPrivate)
+                _gumd_dbus_server_p2p_interface_init)
+        G_ADD_PRIVATE (GumdDbusServerP2P));
 
 #define MAX_STRERROR_LEN       256
 
@@ -268,8 +266,6 @@ gumd_dbus_server_p2p_class_init (
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
     GParamSpec *address_spec = NULL;
 
-    g_type_class_add_private (object_class, sizeof (GumdDbusServerP2PPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;
@@ -289,7 +285,7 @@ static void
 gumd_dbus_server_p2p_init (
         GumdDbusServerP2P *self)
 {
-    self->priv = GUMD_DBUS_SERVER_P2P_GET_PRIV(self);
+    self->priv = gumd_dbus_server_p2p_get_instance_private (self);
     self->priv->bus_server = NULL;
     self->priv->address = NULL;
     self->priv->daemon = gumd_daemon_new ();

diff --git a/src/daemon/dbus/gumd-dbus-user-adapter.c b/src/daemon/dbus/gumd-dbus-user-adapter.c
index 729a6e9..1df2053 100644 (file)
--- a/src/daemon/dbus/gumd-dbus-user-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-user-adapter.c
@@ -52,13 +52,9 @@ struct _GumdDbusUserAdapterPrivate
     GumdDaemon *daemon;
 };
 
-G_DEFINE_TYPE (GumdDbusUserAdapter, gumd_dbus_user_adapter, \
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDbusUserAdapter, gumd_dbus_user_adapter, \
         GUM_TYPE_DISPOSABLE)
 
-#define GUMD_DBUS_USER_ADAPTER_GET_PRIV(obj) \
-    G_TYPE_INSTANCE_GET_PRIVATE ((obj), GUMD_TYPE_USER_ADAPTER,\
-            GumdDbusUserAdapterPrivate)
-
 static void
 _set_property (
         GObject *object,
@@ -151,8 +147,6 @@ gumd_dbus_user_adapter_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumdDbusUserAdapterPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;
@@ -346,7 +340,7 @@ static void
 gumd_dbus_user_adapter_init (
         GumdDbusUserAdapter *self)
 {
-    self->priv = GUMD_DBUS_USER_ADAPTER_GET_PRIV(self);
+    self->priv = gumd_dbus_user_adapter_get_instance_private (self);
 
     self->priv->connection = NULL;
     self->priv->user = NULL;

diff --git a/src/daemon/dbus/gumd-dbus-user-service-adapter.c b/src/daemon/dbus/gumd-dbus-user-service-adapter.c
index 7bfc5e9..30b1766 100755 (executable)
--- a/src/daemon/dbus/gumd-dbus-user-service-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-user-service-adapter.c
@@ -63,13 +63,9 @@ struct _GumdDbusUserServiceAdapterPrivate
     GHashTable *caller_watchers; //(dbus_caller:watcher_id)
 };
 
-G_DEFINE_TYPE (GumdDbusUserServiceAdapter, gumd_dbus_user_service_adapter, \
+G_DEFINE_TYPE_WITH_PRIVATE (GumdDbusUserServiceAdapter, gumd_dbus_user_service_adapter, \
         GUM_TYPE_DISPOSABLE)
 
-#define GUMD_DBUS_USER_SERVICE_ADAPTER_GET_PRIV(obj) \
-    G_TYPE_INSTANCE_GET_PRIVATE ((obj), GUMD_TYPE_USER_SERVICE_ADAPTER, \
-            GumdDbusUserServiceAdapterPrivate)
-
 static gboolean
 _handle_create_new_user (
         GumdDbusUserServiceAdapter *self,
@@ -302,9 +298,6 @@ gumd_dbus_user_service_adapter_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class,
-            sizeof (GumdDbusUserServiceAdapterPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;
@@ -339,7 +332,7 @@ gumd_dbus_user_service_adapter_class_init (
 static void
 gumd_dbus_user_service_adapter_init (GumdDbusUserServiceAdapter *self)
 {
-    self->priv = GUMD_DBUS_USER_SERVICE_ADAPTER_GET_PRIV(self);
+    self->priv = gumd_dbus_user_service_adapter_get_instance_private (self);
 
     self->priv->connection = 0;
     self->priv->daemon = NULL;

diff --git a/src/lib/gum-group.c b/src/lib/gum-group.c
index a03c9a6..bd43a38 100755 (executable)
--- a/src/lib/gum-group.c
+++ b/src/lib/gum-group.c
@@ -123,10 +123,8 @@ struct _GumGroupPrivate
     GumGroupOp *op;
 };
 
-G_DEFINE_TYPE (GumGroup, gum_group, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GumGroup, gum_group, G_TYPE_OBJECT)
 
-#define GUM_GROUP_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUM_TYPE_GROUP, GumGroupPrivate)
 enum
 {
     PROP_0,
@@ -311,7 +309,7 @@ static void
 gum_group_init (
         GumGroup *self)
 {
-    self->priv = GUM_GROUP_PRIV (self);
+    self->priv = gum_group_get_instance_private (self);
     self->priv->dbus_group = NULL;
     self->priv->offline_group = NULL;
     self->priv->cancellable = NULL;
@@ -325,8 +323,6 @@ gum_group_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumGroupPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;

diff --git a/src/lib/gum-user-service.c b/src/lib/gum-user-service.c
index e238588..5eb6bc1 100755 (executable)
--- a/src/lib/gum-user-service.c
+++ b/src/lib/gum-user-service.c
@@ -125,11 +125,6 @@
  * Opaque structure for the class.
  */
 
-G_DEFINE_TYPE (GumUserService, gum_user_service, G_TYPE_OBJECT)
-
-#define GUM_USER_SERVICE_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUM_TYPE_USER_SERVICE, GumUserServicePrivate)
-
 typedef struct {
     gpointer callback;
     gpointer user_data;
@@ -147,6 +142,8 @@ struct _GumUserServicePrivate
     guint dbus_proxy_cb_id;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GumUserService, gum_user_service, G_TYPE_OBJECT)
+
 enum
 {
     PROP_0,
@@ -551,7 +548,7 @@ static void
 gum_user_service_init (
         GumUserService *self)
 {
-    self->priv = GUM_USER_SERVICE_PRIV (self);
+    self->priv = gum_user_service_get_instance_private (self);
     self->priv->cancellable = NULL;
     self->priv->dbus_service = NULL;
     self->priv->offline_service = NULL;
@@ -565,8 +562,6 @@ gum_user_service_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumUserServicePrivate));
-
     object_class->constructor = _constructor;
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;

diff --git a/src/lib/gum-user.c b/src/lib/gum-user.c
index fa98441..e5a07e8 100755 (executable)
--- a/src/lib/gum-user.c
+++ b/src/lib/gum-user.c
@@ -123,10 +123,8 @@ struct _GumUserPrivate
     GumUserOp *op;
 };
 
-G_DEFINE_TYPE (GumUser, gum_user, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GumUser, gum_user, G_TYPE_OBJECT)
 
-#define GUM_USER_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-        GUM_TYPE_USER, GumUserPrivate)
 enum
 {
     PROP_0,
@@ -310,7 +308,7 @@ static void
 gum_user_init (
         GumUser *self)
 {
-    self->priv = GUM_USER_PRIV (self);
+    self->priv = gum_user_get_instance_private (self);
     self->priv->dbus_user = NULL;
     self->priv->offline_user = NULL;
     self->priv->cancellable = NULL;
@@ -324,8 +322,6 @@ gum_user_class_init (
 {
     GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (object_class, sizeof (GumUserPrivate));
-
     object_class->get_property = _get_property;
     object_class->set_property = _set_property;
     object_class->dispose = _dispose;

diff --git a/src/lib/libgum-uninstalled.pc.in b/src/lib/libgum-uninstalled.pc.in
index 7241b39..4c3dd1e 100644 (file)
--- a/src/lib/libgum-uninstalled.pc.in
+++ b/src/lib/libgum-uninstalled.pc.in
@@ -8,6 +8,6 @@ Name: Gum client library
 Description: User management client library, not installed
 Version: @PACKAGE_VERSION@
 URL: @PACKAGE_URL@
-Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0
+Requires: glib-2.0 >= 2.38 gio-2.0 gio-unix-2.0 gmodule-2.0
 Libs: @abs_top_builddir@/src/lib/libgum.la
 Cflags: -I${includedir}

diff --git a/src/lib/libgum.pc.in b/src/lib/libgum.pc.in
index a91e926..4ab934f 100644 (file)
--- a/src/lib/libgum.pc.in
+++ b/src/lib/libgum.pc.in
@@ -7,7 +7,7 @@ Name: Gum client library
 Description: User management client library
 Version: @PACKAGE_VERSION@
 URL: @PACKAGE_URL@
-Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0
+Requires: glib-2.0 >= 2.38 gio-2.0 gio-unix-2.0 gmodule-2.0
 Libs: -L${libdir} -lgum
 Cflags: -I${includedir}