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>
# 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])
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)
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)
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)
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
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 ();
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;
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 (
{
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;
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;
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
{
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;
{
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;
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
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));
{
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;
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;
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);
{
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;
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,
{
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;
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;
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,
{
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;
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;
_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;
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 (
{
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;
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;
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
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;
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 ();
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,
{
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;
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;
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,
{
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;
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;
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,
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;
{
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;
* 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;
guint dbus_proxy_cb_id;
};
+G_DEFINE_TYPE_WITH_PRIVATE (GumUserService, gum_user_service, G_TYPE_OBJECT)
+
enum
{
PROP_0,
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;
{
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;
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,
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;
{
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;
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}
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}