rpms/gnome-shell
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Update conflicting patches after adding passwordless feature

Browse Source 
Resolves: https://redhat.atlassian.net/browse/RHEL-169914
This commit is contained in:
Joan Torres Lopez 2025-12-15 17:38:48 +01:00
parent 3a10d80b78
commit 16d43fc8c4
No known key found for this signature in database
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0001-Support-conflicting-session-dialog.patch
View File

@ -369,15 +369,15 @@ index 25b86880d..83a3bb09d 100644
const ModalDialog = imports.ui.modalDialog;
const PopupMenu = imports.ui.popupMenu;
const Realmd = imports.gdm.realmd;
@@ -36,6 +37,7 @@ const UserWidget = imports.ui.userWidget;
const _FADE_ANIMATION_TIME = 250;
@@ -36,6 +38,7 @@ const _FADE_ANIMATION_TIME = 250;
const _SCROLL_ANIMATION_TIME = 500;
const _FIXED_TOP_ACTOR_HEIGHT = 300;
const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
+const _CONFLICTING_SESSION_DIALOG_TIMEOUT = 60;
const _PRIMARY_LOGIN_METHOD_SECTION_NAME = _('Login Options');
const _SESSION_TYPE_SECTION_NAME = _('Session Type');
var UserListItem = GObject.registerClass({
Signals: { 'activate': {} },
@@ -1044,6 +1046,22 @@ var LoginDialog = GObject.registerClass({
@@ -1077,6 +1079,22 @@ var LoginDialog = GObject.registerClass({
});
}
@ -400,7 +400,7 @@ index 25b86880d..83a3bb09d 100644
_showConflictingSessionDialog(serviceName, conflictingSession) {
let conflictingSessionDialog = new ConflictingSessionDialog(conflictingSession);
@@ -1063,6 +1081,17 @@ var LoginDialog = GObject.registerClass({
@@ -1096,6 +1114,17 @@ var LoginDialog = GObject.registerClass({
}
}, conflictingSessionDialog);
@ -418,7 +418,7 @@ index 25b86880d..83a3bb09d 100644
conflictingSessionDialog.open();
}
@@ -1318,6 +1347,9 @@ var LoginDialog = GObject.registerClass({
@@ -1362,6 +1391,9 @@ var LoginDialog = GObject.registerClass({
this._updateCancelButton();

4
portal-notify.patch
View File

@ -332,7 +332,7 @@ diff --git a/data/icons/meson.build b/data/icons/meson.build
index eff6e4b530..277df017b2 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1 +1,9 @@
@@ -1,2 +1,11 @@
-install_subdir('hicolor', install_dir: icondir)
+excluded_icons=[]
+if not have_portal_helper
@ -343,6 +343,8 @@ index eff6e4b530..277df017b2 100644
+endif
+install_subdir('hicolor',
+ install_dir: icondir, exclude_files: excluded_icons)
+
install_subdir('scalable', install_dir: icondir)
diff --git a/data/meson.build b/data/meson.build
index 4a1e16d467..01cf828310 100644
--- a/data/meson.build