From b3cd9e10b377a3b176034edfdf46eb2ececb381b Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 24 Aug 2020 18:48:21 +0200 Subject: Whitespace fix --- src/backend-dbus/users.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/backend-dbus/users.c') diff --git a/src/backend-dbus/users.c b/src/backend-dbus/users.c index f770695..29cc29c 100644 --- a/src/backend-dbus/users.c +++ b/src/backend-dbus/users.c @@ -240,7 +240,7 @@ untrack_user (IndicatorSessionUsersDbus * self, if (uid) { - g_hash_table_remove (p->uid_to_account, GUINT_TO_POINTER(uid)); + g_hash_table_remove (p->uid_to_account, GUINT_TO_POINTER(uid)); emit_user_removed (self, uid); } -- cgit v1.2.3 From cd78667f5baa22ff64eec87dcef6bafd868c070c Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 24 Aug 2020 18:51:10 +0200 Subject: Fix deprecations and build warnings --- src/backend-dbus/users.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/backend-dbus/users.c') diff --git a/src/backend-dbus/users.c b/src/backend-dbus/users.c index 29cc29c..e6910c6 100644 --- a/src/backend-dbus/users.c +++ b/src/backend-dbus/users.c @@ -21,7 +21,7 @@ #include "users.h" -struct _IndicatorSessionUsersDbusPriv +struct _IndicatorSessionUsersDbusPrivate { Login1Manager * login1_manager; Login1Seat * login1_seat; @@ -45,11 +45,9 @@ struct _IndicatorSessionUsersDbusPriv guint update_list_tag; }; -typedef IndicatorSessionUsersDbusPriv priv_t; +typedef IndicatorSessionUsersDbusPrivate priv_t; -G_DEFINE_TYPE (IndicatorSessionUsersDbus, - indicator_session_users_dbus, - INDICATOR_TYPE_SESSION_USERS) +G_DEFINE_TYPE_WITH_PRIVATE(IndicatorSessionUsersDbus, indicator_session_users_dbus, INDICATOR_TYPE_SESSION_USERS) /*** **** @@ -655,8 +653,6 @@ indicator_session_users_dbus_class_init (IndicatorSessionUsersDbusClass * klass) users_class->get_uids = my_get_uids; users_class->get_user = my_get_user; users_class->activate_user = my_activate_user; - - g_type_class_add_private (klass, sizeof (IndicatorSessionUsersDbusPriv)); } static void @@ -664,9 +660,7 @@ indicator_session_users_dbus_init (IndicatorSessionUsersDbus * self) { priv_t * p; - p = G_TYPE_INSTANCE_GET_PRIVATE (self, - INDICATOR_TYPE_SESSION_USERS_DBUS, - IndicatorSessionUsersDbusPriv); + p = indicator_session_users_dbus_get_instance_private (self); self->priv = p; p->cancellable = g_cancellable_new (); -- cgit v1.2.3