From 16d43fc8c4cae81583c05f78683d9660f3e3e418 Mon Sep 17 00:00:00 2001
From: Joan Torres Lopez <joantolo@redhat.com>
Date: Mon, 15 Dec 2025 17:38:48 +0100
Subject: [PATCH] Update conflicting patches after adding passwordless feature

Resolves: https://redhat.atlassian.net/browse/RHEL-169914
---
 0001-Support-conflicting-session-dialog.patch | 14 +++++++-------
 portal-notify.patch                           |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/0001-Support-conflicting-session-dialog.patch b/0001-Support-conflicting-session-dialog.patch
index 2bc392a..b13ac47 100644
--- a/0001-Support-conflicting-session-dialog.patch
+++ b/0001-Support-conflicting-session-dialog.patch
@@ -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();
  
diff --git a/portal-notify.patch b/portal-notify.patch
index 0b1028c..d2bba1d 100644
--- a/portal-notify.patch
+++ b/portal-notify.patch
@@ -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