From: Adrian Szyndela Date: Mon, 3 Feb 2020 12:41:31 +0000 (+0100) Subject: rework deprecated g_type_class_add_private() X-Git-Tag: accepted/tizen/unified/20200205.125352^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fsystem%2Ftlm.git;a=commitdiff_plain;h=7312c8395d9df2ec312ff91453cf044ed817578a 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: I7884280aea752cc46a8df7a8440c4709b3a998d2 Signed-off-by: Adrian Szyndela --- diff --git a/configure.ac b/configure.ac index 97cec06..dce146d 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_PROG_CC AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums, [$PATH]) # Checks for libraries. -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.38]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec index f6599a0..a340970 100644 --- a/dists/rpm/tizen/packaging/tlm.spec +++ b/dists/rpm/tizen/packaging/tlm.spec @@ -27,7 +27,7 @@ Requires(postun): /sbin/ldconfig Requires(postun): systemd Requires: gumd Requires: libsystemd -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/tlm-suse.spec b/dists/rpm/tlm-suse.spec index 8f2da1b..3f0a6f0 100644 --- a/dists/rpm/tlm-suse.spec +++ b/dists/rpm/tlm-suse.spec @@ -13,7 +13,7 @@ URL: https://github.com/01org/tlm Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig 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/tlm.spec b/packaging/tlm.spec index 04f9aaf..3682d96 100755 --- a/packaging/tlm.spec +++ b/packaging/tlm.spec @@ -28,7 +28,7 @@ Requires(postun): systemd Requires(post): tizen-platform-config Requires: libsystemd Requires: pam-modules-extra -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/tlm-config.c b/src/common/tlm-config.c index 071cd80..dcd2c65 100755 --- a/src/common/tlm-config.c +++ b/src/common/tlm-config.c @@ -97,10 +97,7 @@ struct _TlmConfigPrivate GHashTable *config_table; }; -#define TLM_CONFIG_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - TLM_TYPE_CONFIG, TlmConfigPrivate) - -G_DEFINE_TYPE (TlmConfig, tlm_config, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE (TlmConfig, tlm_config, G_TYPE_OBJECT); static gchar * _check_config_file (const gchar *path) @@ -617,8 +614,6 @@ tlm_config_class_init ( { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, sizeof (TlmConfigPrivate)); - object_class->dispose = tlm_config_dispose; object_class->finalize = tlm_config_finalize; } @@ -646,7 +641,7 @@ static void tlm_config_init ( TlmConfig *self) { - self->priv = TLM_CONFIG_PRIV (self); + self->priv = tlm_config_get_instance_private (self); _initialize (self); } diff --git a/src/common/tlm-pipe-stream.c b/src/common/tlm-pipe-stream.c index bed8a7e..9702f8e 100644 --- a/src/common/tlm-pipe-stream.c +++ b/src/common/tlm-pipe-stream.c @@ -28,16 +28,13 @@ #include "tlm-pipe-stream.h" #include "tlm-log.h" -#define TLM_PIPE_STREAM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj),\ - TLM_TYPE_PIPE_STREAM, TlmPipeStreamPrivate)) - struct _TlmPipeStreamPrivate { GInputStream *input_stream; GOutputStream *output_stream; }; -G_DEFINE_TYPE (TlmPipeStream, tlm_pipe_stream, G_TYPE_IO_STREAM); +G_DEFINE_TYPE_WITH_PRIVATE (TlmPipeStream, tlm_pipe_stream, G_TYPE_IO_STREAM); static GInputStream * _tlm_pipe_stream_get_input_stream (GIOStream *io_stream) @@ -92,14 +89,12 @@ tlm_pipe_stream_class_init (TlmPipeStreamClass *klass) /* virtual methods */ stream_class->get_input_stream = _tlm_pipe_stream_get_input_stream; stream_class->get_output_stream = _tlm_pipe_stream_get_output_stream; - - g_type_class_add_private (klass, sizeof (TlmPipeStreamPrivate)); } static void tlm_pipe_stream_init (TlmPipeStream *self) { - self->priv = TLM_PIPE_STREAM_GET_PRIVATE (self); + self->priv = tlm_pipe_stream_get_instance_private (self); self->priv->input_stream = NULL; self->priv->output_stream = NULL; } diff --git a/src/daemon/dbus/tlm-dbus-login-adapter.c b/src/daemon/dbus/tlm-dbus-login-adapter.c index 3047aec..f8e2f68 100644 --- a/src/daemon/dbus/tlm-dbus-login-adapter.c +++ b/src/daemon/dbus/tlm-dbus-login-adapter.c @@ -48,11 +48,7 @@ struct _TlmDbusLoginAdapterPrivate TlmDbusLogin *dbus_obj; }; -G_DEFINE_TYPE (TlmDbusLoginAdapter, tlm_dbus_login_adapter, G_TYPE_OBJECT) - -#define TLM_DBUS_LOGIN_ADAPTER_GET_PRIV(obj) \ - G_TYPE_INSTANCE_GET_PRIVATE ((obj), TLM_TYPE_LOGIN_ADAPTER, \ - TlmDbusLoginAdapterPrivate) +G_DEFINE_TYPE_WITH_PRIVATE (TlmDbusLoginAdapter, tlm_dbus_login_adapter, G_TYPE_OBJECT) enum { SIG_LOGIN_USER, @@ -175,9 +171,6 @@ tlm_dbus_login_adapter_class_init ( { GObjectClass* object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, - sizeof (TlmDbusLoginAdapterPrivate)); - object_class->get_property = _get_property; object_class->set_property = _set_property; object_class->dispose = _dispose; @@ -238,7 +231,7 @@ tlm_dbus_login_adapter_class_init ( static void tlm_dbus_login_adapter_init (TlmDbusLoginAdapter *self) { - self->priv = TLM_DBUS_LOGIN_ADAPTER_GET_PRIV(self); + self->priv = tlm_dbus_login_adapter_get_instance_private (self); self->priv->connection = 0; self->priv->dbus_obj = tlm_dbus_login_skeleton_new (); diff --git a/src/daemon/dbus/tlm-dbus-server-p2p.c b/src/daemon/dbus/tlm-dbus-server-p2p.c index 5cfa3d8..6e52311 100755 --- a/src/daemon/dbus/tlm-dbus-server-p2p.c +++ b/src/daemon/dbus/tlm-dbus-server-p2p.c @@ -83,10 +83,8 @@ _on_connection_closed ( G_DEFINE_TYPE_WITH_CODE (TlmDbusServerP2P, tlm_dbus_server_p2p, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (TLM_TYPE_DBUS_SERVER, - _tlm_dbus_server_p2p_interface_init)); - -#define TLM_DBUS_SERVER_P2P_GET_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj),\ - TLM_TYPE_DBUS_SERVER_P2P, TlmDbusServerP2PPrivate) + _tlm_dbus_server_p2p_interface_init) + G_ADD_PRIVATE(TlmDbusServerP2P)); static void _set_property ( @@ -216,8 +214,6 @@ tlm_dbus_server_p2p_class_init ( GObjectClass* object_class = G_OBJECT_CLASS (klass); GParamSpec *address_spec = NULL; - g_type_class_add_private (object_class, sizeof (TlmDbusServerP2PPrivate)); - object_class->get_property = _get_property; object_class->set_property = _set_property; object_class->dispose = _dispose; @@ -258,7 +254,7 @@ static void tlm_dbus_server_p2p_init ( TlmDbusServerP2P *self) { - self->priv = TLM_DBUS_SERVER_P2P_GET_PRIV(self); + self->priv = tlm_dbus_server_p2p_get_instance_private (self); self->priv->bus_server = NULL; self->priv->address = NULL; self->priv->uid = 0; diff --git a/src/daemon/tlm-dbus-observer.c b/src/daemon/tlm-dbus-observer.c index 4e9da0b..98ab6b4 100644 --- a/src/daemon/tlm-dbus-observer.c +++ b/src/daemon/tlm-dbus-observer.c @@ -44,11 +44,6 @@ #include "tlm-manager.h" #include "common/tlm-error.h" -G_DEFINE_TYPE (TlmDbusObserver, tlm_dbus_observer, G_TYPE_OBJECT); - -#define TLM_DBUS_OBSERVER_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - TLM_TYPE_DBUS_OBSERVER, TlmDbusObserverPrivate) - typedef struct { TlmDbusRequest *dbus_request; @@ -66,6 +61,8 @@ struct _TlmDbusObserverPrivate DbusObserverEnableFlags enable_flags; }; +G_DEFINE_TYPE_WITH_PRIVATE (TlmDbusObserver, tlm_dbus_observer, G_TYPE_OBJECT); + static void _handle_dbus_client_added ( TlmDbusObserver *self, @@ -769,8 +766,6 @@ tlm_dbus_observer_class_init (TlmDbusObserverClass *klass) { GObjectClass *g_klass = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (TlmDbusObserverPrivate)); - g_klass->dispose = tlm_dbus_observer_dispose ; g_klass->finalize = tlm_dbus_observer_finalize; } @@ -778,7 +773,7 @@ tlm_dbus_observer_class_init (TlmDbusObserverClass *klass) static void tlm_dbus_observer_init (TlmDbusObserver *dbus_observer) { - TlmDbusObserverPrivate *priv = TLM_DBUS_OBSERVER_PRIV (dbus_observer); + TlmDbusObserverPrivate *priv = tlm_dbus_observer_get_instance_private (dbus_observer); priv->manager = NULL; priv->seat = NULL; diff --git a/src/daemon/tlm-manager.c b/src/daemon/tlm-manager.c index f9200dd..67475a8 100644 --- a/src/daemon/tlm-manager.c +++ b/src/daemon/tlm-manager.c @@ -46,11 +46,6 @@ #include #include -G_DEFINE_TYPE (TlmManager, tlm_manager, G_TYPE_OBJECT); - -#define TLM_MANAGER_PRIV(obj) \ - G_TYPE_INSTANCE_GET_PRIVATE ((obj), TLM_TYPE_MANAGER, TlmManagerPrivate) - #define LOGIND_BUS_NAME "org.freedesktop.login1" #define LOGIND_OBJECT_PATH "/org/freedesktop/login1" #define LOGIND_MANAGER_IFACE LOGIND_BUS_NAME".Manager" @@ -70,6 +65,8 @@ struct _TlmManagerPrivate guint seat_removed_id; }; +G_DEFINE_TYPE_WITH_PRIVATE (TlmManager, tlm_manager, G_TYPE_OBJECT); + enum { PROP_0, PROP_INITIAL_USER, @@ -200,8 +197,6 @@ tlm_manager_class_init (TlmManagerClass *klass) { GObjectClass *g_klass = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (TlmManagerPrivate)); - g_klass->constructor = tlm_manager_constructor; g_klass->dispose = tlm_manager_dispose ; g_klass->finalize = tlm_manager_finalize; @@ -427,7 +422,7 @@ static void tlm_manager_init (TlmManager *manager) { GError *error = NULL; - TlmManagerPrivate *priv = TLM_MANAGER_PRIV (manager); + TlmManagerPrivate *priv = tlm_manager_get_instance_private (manager); priv->config = tlm_config_new (); @@ -503,7 +498,7 @@ _create_seat (TlmManager *manager, { g_return_if_fail (manager && TLM_IS_MANAGER (manager)); - TlmManagerPrivate *priv = TLM_MANAGER_PRIV (manager); + TlmManagerPrivate *priv = tlm_manager_get_instance_private (manager); TlmSeat *seat = tlm_seat_new (priv->config, seat_id, @@ -568,7 +563,7 @@ _add_seat (TlmManager *manager, const gchar *seat_id, const gchar *seat_path) { g_return_if_fail (manager && TLM_IS_MANAGER (manager)); - TlmManagerPrivate *priv = TLM_MANAGER_PRIV (manager); + TlmManagerPrivate *priv = tlm_manager_get_instance_private (manager); // Do nothing if the seat is not active if (!tlm_config_get_boolean (priv->config, diff --git a/src/daemon/tlm-seat.c b/src/daemon/tlm-seat.c index 64ec5f6..7284c29 100644 --- a/src/daemon/tlm-seat.c +++ b/src/daemon/tlm-seat.c @@ -41,11 +41,6 @@ #include "tlm-config-general.h" #include "tlm-dbus-observer.h" -G_DEFINE_TYPE (TlmSeat, tlm_seat, G_TYPE_OBJECT); - -#define TLM_SEAT_PRIV(obj) \ - G_TYPE_INSTANCE_GET_PRIVATE ((obj), TLM_TYPE_SEAT, TlmSeatPrivate) - enum { PROP_0, PROP_CONFIG, @@ -85,6 +80,8 @@ struct _TlmSeatPrivate gboolean manager_stop; }; +G_DEFINE_TYPE_WITH_PRIVATE (TlmSeat, tlm_seat, G_TYPE_OBJECT); + typedef struct _DelayClosure { TlmSeat *seat; @@ -128,7 +125,7 @@ _handle_session_created ( static void _close_active_session (TlmSeat *self) { - TlmSeatPrivate *priv = TLM_SEAT_PRIV (self); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (self); _disconnect_session_signals (self); if (priv->session) { DBG("Clear session_remote object"); @@ -144,7 +141,7 @@ _handle_session_terminated ( g_return_if_fail (self && TLM_IS_SEAT (self)); TlmSeat *seat = TLM_SEAT(self); - TlmSeatPrivate *priv = TLM_SEAT_PRIV(seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); gboolean stop = FALSE; DBG ("seat %p session %p", self, priv->session); @@ -218,7 +215,7 @@ static void _disconnect_session_signals ( TlmSeat *seat) { - TlmSeatPrivate *priv = TLM_SEAT_PRIV (seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); if (!priv->session) return; DBG ("seat %p session %p", seat, priv->session); @@ -234,7 +231,7 @@ static void _connect_session_signals ( TlmSeat *seat) { - TlmSeatPrivate *priv = TLM_SEAT_PRIV (seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); DBG ("seat %p", seat); /* Connect session signals to handlers */ g_signal_connect_swapped (priv->session, "session-created", @@ -294,7 +291,7 @@ static void tlm_seat_finalize (GObject *self) { TlmSeat *seat = TLM_SEAT(self); - TlmSeatPrivate *priv = TLM_SEAT_PRIV(seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); g_clear_string (&priv->id); g_clear_string (&priv->default_user); @@ -312,7 +309,7 @@ _seat_set_property (GObject *obj, GParamSpec *pspec) { TlmSeat *seat = TLM_SEAT(obj); - TlmSeatPrivate *priv = TLM_SEAT_PRIV(seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); switch (property_id) { case PROP_CONFIG: @@ -336,7 +333,7 @@ _seat_get_property (GObject *obj, GParamSpec *pspec) { TlmSeat *seat = TLM_SEAT(obj); - TlmSeatPrivate *priv = TLM_SEAT_PRIV(seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); switch (property_id) { case PROP_CONFIG: @@ -358,8 +355,6 @@ tlm_seat_class_init (TlmSeatClass *klass) { GObjectClass *g_klass = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (TlmSeatPrivate)); - g_klass->dispose = tlm_seat_dispose ; g_klass->finalize = tlm_seat_finalize; g_klass->set_property = _seat_set_property; @@ -443,7 +438,7 @@ tlm_seat_class_init (TlmSeatClass *klass) static void tlm_seat_init (TlmSeat *seat) { - TlmSeatPrivate *priv = TLM_SEAT_PRIV (seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); priv->id = priv->path = priv->default_user = NULL; priv->dbus_observer = priv->prev_dbus_observer = NULL; @@ -462,7 +457,7 @@ tlm_seat_get_id (TlmSeat *seat) gchar * tlm_seat_get_occupying_username (TlmSeat *seat) { - TlmSeatPrivate *priv = TLM_SEAT_PRIV (seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); if (!priv->session) return NULL; TlmSessionRemote *sr = priv->session; @@ -483,7 +478,7 @@ tlm_seat_switch_user (TlmSeat *seat, DBG("run tlm_seat_switch_user()"); g_return_val_if_fail (seat && TLM_IS_SEAT(seat), FALSE); - TlmSeatPrivate *priv = TLM_SEAT_PRIV (seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); // If username & its password is not authenticated, immediately return FALSE // so that current session is not terminated. @@ -635,7 +630,7 @@ tlm_seat_create_session (TlmSeat *seat, GHashTable *environment) { g_return_val_if_fail (seat && TLM_IS_SEAT(seat), FALSE); - TlmSeatPrivate *priv = TLM_SEAT_PRIV (seat); + TlmSeatPrivate *priv = tlm_seat_get_instance_private (seat); // Ignore creating session if there is an existing session already if (priv->session != NULL) { diff --git a/src/daemon/tlm-session-remote.c b/src/daemon/tlm-session-remote.c index 7a28ff0..c68276e 100644 --- a/src/daemon/tlm-session-remote.c +++ b/src/daemon/tlm-session-remote.c @@ -72,11 +72,8 @@ struct _TlmSessionRemotePrivate gulong signal_error; }; -G_DEFINE_TYPE (TlmSessionRemote, tlm_session_remote, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE (TlmSessionRemote, tlm_session_remote, G_TYPE_OBJECT); -#define TLM_SESSION_REMOTE_PRIV(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TLM_TYPE_SESSION_REMOTE, \ - TlmSessionRemotePrivate)) enum { SIG_SESSION_CREATED, SIG_SESSION_TERMINATED, @@ -169,7 +166,7 @@ static gboolean _terminate_timeout (gpointer user_data) { TlmSessionRemote *self = TLM_SESSION_REMOTE(user_data); - TlmSessionRemotePrivate *priv = TLM_SESSION_REMOTE_PRIV(self); + TlmSessionRemotePrivate *priv = tlm_session_remote_get_instance_private (self); gchar strerr_buf[MAX_STRERROR_LEN] = {0,}; switch (priv->last_sig) @@ -290,9 +287,6 @@ tlm_session_remote_class_init (TlmSessionRemoteClass *klass) { GObjectClass* object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, - sizeof (TlmSessionRemotePrivate)); - object_class->get_property = tlm_session_remote_get_property; object_class->set_property = tlm_session_remote_set_property; object_class->dispose = tlm_session_remote_dispose; @@ -355,7 +349,7 @@ tlm_session_remote_class_init (TlmSessionRemoteClass *klass) static void tlm_session_remote_init (TlmSessionRemote *self) { - self->priv = TLM_SESSION_REMOTE_PRIV(self); + self->priv = tlm_session_remote_get_instance_private (self); self->priv->connection = NULL; self->priv->dbus_session_proxy = NULL; @@ -554,7 +548,7 @@ tlm_session_remote_terminate ( TlmSessionRemote *self) { g_return_val_if_fail (self && TLM_IS_SESSION_REMOTE(self), FALSE); - TlmSessionRemotePrivate *priv = TLM_SESSION_REMOTE_PRIV(self); + TlmSessionRemotePrivate *priv = tlm_session_remote_get_instance_private (self); if (!priv->is_sessiond_up) { WARN ("sessiond is not running"); diff --git a/src/daemon/tlm.pc.in b/src/daemon/tlm.pc.in index 3dc0e16..15e72a9 100644 --- a/src/daemon/tlm.pc.in +++ b/src/daemon/tlm.pc.in @@ -9,4 +9,4 @@ Name: TLM daemon Description: Tiny login management daemon 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 diff --git a/src/sessiond/tlm-auth-session.c b/src/sessiond/tlm-auth-session.c index ccaeabb..38e01cb 100755 --- a/src/sessiond/tlm-auth-session.c +++ b/src/sessiond/tlm-auth-session.c @@ -42,12 +42,6 @@ #include "common/tlm-utils.h" #include "common/tlm-error.h" -G_DEFINE_TYPE (TlmAuthSession, tlm_auth_session, G_TYPE_OBJECT); - -#define TLM_AUTH_SESSION_PRIV(obj) \ - G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - TLM_TYPE_AUTH_SESSION, TlmAuthSessionPrivate) - enum { PROP_0, PROP_SERVICE, @@ -68,6 +62,8 @@ struct _TlmAuthSessionPrivate pam_handle_t *pam_handle; }; +G_DEFINE_TYPE_WITH_PRIVATE (TlmAuthSession, tlm_auth_session, G_TYPE_OBJECT); + static void _auth_session_stop (TlmAuthSession *auth_session) { @@ -76,7 +72,7 @@ _auth_session_stop (TlmAuthSession *auth_session) g_return_if_fail (auth_session && TLM_IS_AUTH_SESSION (auth_session)); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); g_return_if_fail (priv->pam_handle); res = pam_setcred (priv->pam_handle, PAM_DELETE_CRED); @@ -99,7 +95,7 @@ static void tlm_auth_session_dispose (GObject *self) { TlmAuthSession *auth_session = TLM_AUTH_SESSION (self); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); DBG ("disposing auth_session: %s:%s", priv->service, priv->username); if (priv->pam_handle) @@ -129,7 +125,7 @@ _auth_session_set_property (GObject *obj, GParamSpec *pspec) { TlmAuthSession *auth_session = TLM_AUTH_SESSION (obj); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); switch (property_id) { case PROP_SERVICE: @@ -157,7 +153,7 @@ _auth_session_get_property (GObject *obj, GParamSpec *pspec) { TlmAuthSession *auth_session = TLM_AUTH_SESSION(obj); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); switch (property_id) { case PROP_SERVICE: @@ -183,8 +179,6 @@ tlm_auth_session_class_init (TlmAuthSessionClass *klass) { GObjectClass *g_klass = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof(TlmAuthSessionPrivate)); - g_klass->dispose = tlm_auth_session_dispose ; g_klass->finalize = tlm_auth_session_finalize; g_klass->set_property = _auth_session_set_property; @@ -225,7 +219,7 @@ tlm_auth_session_class_init (TlmAuthSessionClass *klass) static void tlm_auth_session_init (TlmAuthSession *auth_session) { - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); priv->service = priv->username = NULL; @@ -353,7 +347,7 @@ tlm_auth_session_authenticate (TlmAuthSession *auth_session, GError **error) g_return_val_if_fail (auth_session && TLM_IS_AUTH_SESSION(auth_session), FALSE); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); pam_tty = getenv ("DISPLAY"); if (!pam_tty) @@ -407,7 +401,7 @@ tlm_auth_session_open (TlmAuthSession *auth_session, GError **error) g_return_val_if_fail (auth_session && TLM_IS_AUTH_SESSION(auth_session), FALSE); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); /*res = pam_acct_mgmt (priv->pam_handle, 0); if (res == PAM_NEW_AUTHTOK_REQD) { @@ -460,7 +454,7 @@ tlm_auth_session_new (const gchar *service, "password", password, "ttyname", tty_name, NULL)); - TlmAuthSessionPrivate *priv = TLM_AUTH_SESSION_PRIV (auth_session); + TlmAuthSessionPrivate *priv = tlm_auth_session_get_instance_private (auth_session); struct pam_conv conv = { _auth_session_pam_conversation_cb, auth_session }; diff --git a/src/sessiond/tlm-session-daemon.c b/src/sessiond/tlm-session-daemon.c index c18414f..7b2d5c4 100644 --- a/src/sessiond/tlm-session-daemon.c +++ b/src/sessiond/tlm-session-daemon.c @@ -39,12 +39,7 @@ struct _TlmSessionDaemonPrivate TlmSession *session; }; -G_DEFINE_TYPE (TlmSessionDaemon, tlm_session_daemon, G_TYPE_OBJECT) - - -#define TLM_SESSION_DAEMON_GET_PRIV(obj) \ - G_TYPE_INSTANCE_GET_PRIVATE ((obj), TLM_TYPE_SESSION_DAEMON,\ - TlmSessionDaemonPrivate) +G_DEFINE_TYPE_WITH_PRIVATE (TlmSessionDaemon, tlm_session_daemon, G_TYPE_OBJECT) static void _dispose (GObject *object) @@ -82,9 +77,6 @@ tlm_session_daemon_class_init ( { GObjectClass* object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, sizeof ( - TlmSessionDaemonPrivate)); - object_class->dispose = _dispose; object_class->finalize = _finalize; @@ -94,7 +86,7 @@ static void tlm_session_daemon_init ( TlmSessionDaemon *self) { - self->priv = TLM_SESSION_DAEMON_GET_PRIV(self); + self->priv = tlm_session_daemon_get_instance_private (self); self->priv->connection = NULL; self->priv->dbus_session = NULL; self->priv->session = NULL; diff --git a/src/sessiond/tlm-session.c b/src/sessiond/tlm-session.c index 7c8c08c..3ced70d 100755 --- a/src/sessiond/tlm-session.c +++ b/src/sessiond/tlm-session.c @@ -55,11 +55,6 @@ #include "common/tlm-config-general.h" #include "common/tlm-config-seat.h" -G_DEFINE_TYPE (TlmSession, tlm_session, G_TYPE_OBJECT); - -#define TLM_SESSION_PRIV(obj) \ - G_TYPE_INSTANCE_GET_PRIVATE ((obj), TLM_TYPE_SESSION, TlmSessionPrivate) - enum { PROP_0, PROP_CONFIG, @@ -106,6 +101,8 @@ struct _TlmSessionPrivate int kb_mode; }; +G_DEFINE_TYPE_WITH_PRIVATE (TlmSession, tlm_session, G_TYPE_OBJECT); + static void tlm_session_dispose (GObject *self) { @@ -137,7 +134,7 @@ _session_set_property (GObject *obj, GParamSpec *pspec) { TlmSession *session = TLM_SESSION(obj); - TlmSessionPrivate *priv = TLM_SESSION_PRIV (session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); switch (property_id) { case PROP_CONFIG: @@ -170,7 +167,7 @@ _session_get_property (GObject *obj, GParamSpec *pspec) { TlmSession *session = TLM_SESSION(obj); - TlmSessionPrivate *priv = TLM_SESSION_PRIV (session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); switch (property_id) { case PROP_CONFIG: @@ -198,8 +195,6 @@ tlm_session_class_init (TlmSessionClass *klass) { GObjectClass *g_klass = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (TlmSessionPrivate)); - g_klass->dispose = tlm_session_dispose ; g_klass->finalize = tlm_session_finalize; g_klass->set_property = _session_set_property; @@ -263,7 +258,7 @@ tlm_session_class_init (TlmSessionClass *klass) static void tlm_session_init (TlmSession *session) { - TlmSessionPrivate *priv = TLM_SESSION_PRIV (session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); priv->tty_dev = NULL; priv->service = NULL; @@ -490,7 +485,7 @@ _set_environment (TlmSessionPrivate *priv) static void _clear_session (TlmSession *session) { - TlmSessionPrivate *priv = TLM_SESSION_PRIV (session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); _reset_terminal (priv); @@ -760,7 +755,7 @@ tlm_session_start (TlmSession *session, { GError *error = NULL; g_return_val_if_fail (session && TLM_IS_SESSION(session), FALSE); - TlmSessionPrivate *priv = TLM_SESSION_PRIV(session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); const gchar *session_type; if (!seat_id || !service || !username) { @@ -875,7 +870,7 @@ static gboolean _terminate_timeout (gpointer user_data) { TlmSession *session = TLM_SESSION(user_data); - TlmSessionPrivate *priv = TLM_SESSION_PRIV(session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); gchar strerr_buf[MAX_STRERROR_LEN] = {0,}; switch (priv->last_sig) @@ -924,7 +919,7 @@ void tlm_session_terminate (TlmSession *session) { g_return_if_fail (session && TLM_IS_SESSION(session)); - TlmSessionPrivate *priv = TLM_SESSION_PRIV(session); + TlmSessionPrivate *priv = tlm_session_get_instance_private (session); DBG ("Session Terminate");