Accepting request 1103101 from GNOME:Next

- Rebase as-fate318433-prevent-same-account-multi-logins.patch:
  (bsc#1213884).

OBS-URL: https://build.opensuse.org/request/show/1103101
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=165
This commit is contained in:
Luciano Santos 2023-08-10 01:00:59 +00:00 committed by Git OBS Bridge
parent 5598426c2e
commit 2fe7c185d9
2 changed files with 29 additions and 20 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 9 01:27:12 UTC 2023 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Rebase as-fate318433-prevent-same-account-multi-logins.patch:
(bsc#1213884).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 5 03:07:00 UTC 2023 - Xiaoguang Wang <xiaoguang.wang@suse.com> Wed Jul 5 03:07:00 UTC 2023 - Xiaoguang Wang <xiaoguang.wang@suse.com>

View File

@ -1,7 +1,8 @@
diff -Nur accountsservice-22.08.8/src/libaccountsservice/act-user.c new/src/libaccountsservice/act-user.c Index: accountsservice-23.13.9/src/libaccountsservice/act-user.c
--- accountsservice-22.08.8/src/libaccountsservice/act-user.c 2022-02-23 16:27:48.000000000 +0100 ===================================================================
+++ new/src/libaccountsservice/act-user.c 2022-04-30 22:34:42.160346848 +0200 --- accountsservice-23.13.9.orig/src/libaccountsservice/act-user.c
@@ -878,6 +878,8 @@ +++ accountsservice-23.13.9/src/libaccountsservice/act-user.c
@@ -878,6 +878,8 @@ act_user_is_logged_in (ActUser *user)
* (Currently, this function is only implemented for systemd-logind. * (Currently, this function is only implemented for systemd-logind.
* For ConsoleKit, it is equivalent to act_user_is_logged_in.) * For ConsoleKit, it is equivalent to act_user_is_logged_in.)
* *
@ -10,7 +11,7 @@ diff -Nur accountsservice-22.08.8/src/libaccountsservice/act-user.c new/src/liba
* Returns: %TRUE or %FALSE * Returns: %TRUE or %FALSE
*/ */
gboolean gboolean
@@ -906,6 +908,24 @@ @@ -906,6 +908,24 @@ act_user_get_saved (ActUser *user)
} }
/** /**
@ -35,21 +36,23 @@ diff -Nur accountsservice-22.08.8/src/libaccountsservice/act-user.c new/src/liba
* act_user_get_locked: * act_user_get_locked:
* @user: a #ActUser * @user: a #ActUser
* *
diff -Nur accountsservice-22.08.8/src/libaccountsservice/act-user.h new/src/libaccountsservice/act-user.h Index: accountsservice-23.13.9/src/libaccountsservice/act-user.h
--- accountsservice-22.08.8/src/libaccountsservice/act-user.h 2022-02-23 16:27:48.000000000 +0100 ===================================================================
+++ new/src/libaccountsservice/act-user.h 2022-04-30 22:34:42.164346848 +0200 --- accountsservice-23.13.9.orig/src/libaccountsservice/act-user.h
@@ -61,6 +61,7 @@ +++ accountsservice-23.13.9/src/libaccountsservice/act-user.h
@@ -60,6 +60,7 @@ guint act_user_get_num_sessions
guint act_user_get_num_sessions_anywhere (ActUser *user); guint act_user_get_num_sessions_anywhere (ActUser *user);
gboolean act_user_is_logged_in (ActUser *user); gboolean act_user_is_logged_in (ActUser *user);
gboolean act_user_is_logged_in_anywhere (ActUser *user); gboolean act_user_is_logged_in_anywhere (ActUser *user);
+gboolean act_user_is_x_logged_in_remotely (ActUser *user); +gboolean act_user_is_x_logged_in_remotely (ActUser *user);
int act_user_get_login_frequency (ActUser *user); int act_user_get_login_frequency (ActUser *user);
gint64 act_user_get_login_time (ActUser *user); gint64 act_user_get_login_time (ActUser *user);
const GVariant*act_user_get_login_history (ActUser *user); const GVariant *act_user_get_login_history (ActUser *user);
diff -Nur accountsservice-22.08.8/src/libaccountsservice/act-user-manager.c new/src/libaccountsservice/act-user-manager.c Index: accountsservice-23.13.9/src/libaccountsservice/act-user-manager.c
--- accountsservice-22.08.8/src/libaccountsservice/act-user-manager.c 2022-02-23 16:27:48.000000000 +0100 ===================================================================
+++ new/src/libaccountsservice/act-user-manager.c 2022-04-30 22:34:42.160346848 +0200 --- accountsservice-23.13.9.orig/src/libaccountsservice/act-user-manager.c
@@ -1366,12 +1366,22 @@ +++ accountsservice-23.13.9/src/libaccountsservice/act-user-manager.c
@@ -1425,12 +1425,22 @@ maybe_add_new_session (ActUserManagerNew
if (new_session->x11_display == NULL) { if (new_session->x11_display == NULL) {
g_debug ("AcUserManager: (mostly) ignoring session '%s' since it's not graphical", g_debug ("AcUserManager: (mostly) ignoring session '%s' since it's not graphical",
new_session->id); new_session->id);