Merge branch 'master' into gwl/add-support-for-slide-on-overflow

Author: anaximeno

.github/workflows/build.yml

@@ -28,7 +28,6 @@ jobs:
         linuxmint/cinnamon-control-center,
         linuxmint/cinnamon-desktop,
         linuxmint/cinnamon-menus,
-        linuxmint/cinnamon-screensaver,
         linuxmint/cinnamon-session,
         linuxmint/cinnamon-settings-daemon,
         linuxmint/cinnamon-translations,

.github/workflows/pattern-checker.yml

@@ -0,0 +1,25 @@
+name: Pattern Check
+
+on:
+    pull_request_target:
+        branches: [ master ]
+
+permissions:
+    pull-requests: write
+
+jobs:
+    pattern-check:
+        name: Pattern Check
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout github-actions
+              uses: actions/checkout@v6
+              with:
+                  repository: linuxmint/github-actions
+                  path: _github-actions
+
+            - name: Pattern Check
+              uses: ./_github-actions/pattern-checker
+              with:
+                  github_token: ${{ github.token }}

cinnamon.session.in

@@ -1,6 +1,6 @@
 [Cinnamon Session]
 Name=Cinnamon
-RequiredComponents=cinnamon;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
+RequiredComponents=cinnamon;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
 DesktopName=X-Cinnamon
 
 

cinnamon2d.session.in

@@ -1,6 +1,6 @@
 [Cinnamon Session]
 Name=Cinnamon (Software Rendering)
-RequiredComponents=cinnamon2d;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
+RequiredComponents=cinnamon2d;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
 DesktopName=X-Cinnamon
 
 

data/meson.build

@@ -62,3 +62,5 @@ gnome.compile_resources(
     install: true,
     install_dir: pkgdatadir
 )
+
+subdir('pam')

data/org.cinnamon.gschema.xml

@@ -472,17 +472,6 @@
       </description>
     </key>
 
-    <key type="b" name="enable-edge-flip">
-      <default>false</default>
-      <summary>Whether edge flip is enabled</summary>
-    </key>
-
-    <key type="i" name="edge-flip-delay">
-      <default>1000</default>
-      <summary>Duration of the delay before switching the workspace</summary>
-      <description>Duration of the delay (in milliseconds)</description>
-    </key>
-
     <key type="b" name="cinnamon-settings-advanced">
       <default>false</default>
       <summary>Whether advanced mode is enabled in cinnamon-settings</summary>
@@ -532,6 +521,24 @@
       <description>If true, the pointer will be set to the center of the new monitor when using pointer next/previous shortcuts.</description>
     </key>
 
+    <key type="b" name="internal-screensaver-enabled">
+      <default>true</default>
+      <summary>Use internal screensaver implementation. Requires cinnamon restart if changed.</summary>
+      <description>If true, use Cinnamon's internal screensaver for locking instead of the external cinnamon-screensaver daemon.</description>
+    </key>
+
+    <key type="b" name="session-locked-state">
+      <default>false</default>
+      <summary>Whether the session is currently locked</summary>
+      <description>Persists the screensaver locked state so it can be restored after a Cinnamon restart. This key is managed internally and should not be modified manually.</description>
+    </key>
+
+    <key type="b" name="debug-screensaver">
+      <default>false</default>
+      <summary>Enable screensaver debug logging</summary>
+      <description>If true, enables verbose debug logging for the screensaver, unlock dialog, and backup-locker.</description>
+    </key>
+
     <child name="theme" schema="org.cinnamon.theme"/>
     <child name="recorder" schema="org.cinnamon.recorder"/>
     <child name="keyboard" schema="org.cinnamon.keyboard"/>

data/pam/cinnamon.pam

@@ -0,0 +1,16 @@
+#%PAM-1.0
+
+# Fedora & Arch
+-auth      sufficient   pam_selinux_permit.so
+auth       include      system-auth
+-auth       optional     pam_gnome_keyring.so
+account    include      system-auth
+password   include      system-auth
+session    include      system-auth
+
+# SuSE/Novell
+#auth       include      common-auth
+#auth       optional     pam_gnome_keyring.so
+#account    include      common-account
+#password   include      common-password
+#session    include      common-session

data/pam/cinnamon.pam.debian

@@ -0,0 +1,2 @@
+@include common-auth
+auth optional pam_gnome_keyring.so

data/pam/meson.build

@@ -0,0 +1,18 @@
+pamdir = get_option('pam_prefix')
+if pamdir == ''
+  pamdir = sysconfdir
+endif
+
+if get_option('use_debian_pam')
+  install_data(
+    'cinnamon.pam.debian',
+    rename: 'cinnamon',
+    install_dir: join_paths(pamdir, 'pam.d')
+  )
+else
+  install_data(
+    'cinnamon.pam',
+    rename: 'cinnamon',
+    install_dir: join_paths(pamdir, 'pam.d')
+  )
+endif

data/services/meson.build

@@ -1,4 +1,5 @@
 service_files = [
+  'org.cinnamon.BackupLocker.service',
   'org.cinnamon.CalendarServer.service',
   'org.Cinnamon.HotplugSniffer.service',
   'org.Cinnamon.Melange.service',