Merge branch 'main' into lenemter/bg-blur-2

Author: zeebok

.github/workflows/gettext.yml

@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: |
         apt update
@@ -47,7 +47,7 @@ jobs:
       image: fedora:latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Dependencies
         run: |
           dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel libcanberra-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc
@@ -70,7 +70,7 @@ jobs:
           zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
           zypper --gpg-auto-import-keys refresh
           zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 libcanberra-devel clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build
         env:
           DESTDIR: out
@@ -85,7 +85,7 @@ jobs:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Lint
       run: |
         io.elementary.vala-lint -d daemon

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
      runs-on: ubuntu-22.04
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v4
+     - uses: actions/checkout@v5
      - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

data/[email protected]

@@ -22,7 +22,7 @@ Type=notify
 ExecStart=@bindir@/gala
 
 # unset some environment variables that were set by the compositor and won't work now that the compositor is gone
-ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY'
+ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY && rm -f "$XDG_RUNTIME_DIR/wayland-0" "$XDG_RUNTIME_DIR/wayland-0.lock"'
 
 # On wayland we cannot restart
 Restart=no

meson.build

@@ -141,6 +141,17 @@ if mutter48_dep.found()
 	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48']
 endif
 
+mutter49_dep = dependency('libmutter-17', version: ['>= 49', '< 50'], required: false)
+if mutter49_dep.found()
+	libmutter_dep = dependency('libmutter-17', version: '>= 49')
+	mutter_dep = [
+		libmutter_dep,
+		dependency('mutter-mtk-17'), dependency('mutter-cogl-17'),
+		dependency('mutter-clutter-17')
+	]
+	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49']
+endif
+
 if mutter_dep.length() == 0
     error ('No supported mutter library found!')
 endif

po/zh_CN.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: noise\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-06-30 17:54+0000\n"
-"PO-Revision-Date: 2025-08-02 18:55+0000\n"
+"PO-Revision-Date: 2025-08-15 16:55+0000\n"
 "Last-Translator: JieXu <[email protected]>\n"
 "Language-Team: Chinese (Simplified Han script) <https://"
 "l10n.elementaryos.org/projects/desktop/gala/zh_Hans/>\n"
@@ -33,10 +33,8 @@ msgid "System Settings…"
 msgstr "系统设置…"
 
 #: daemon/DBus.vala:218 daemon-gtk3/BackgroundMenu.vala:47
-#, fuzzy
-#| msgid "System Settings…"
 msgid "Failed to open System Settings"
-msgstr "系统设置…"
+msgstr "无法打开系统设置"
 
 #: daemon/DBus.vala:219 daemon-gtk3/BackgroundMenu.vala:48
 msgid "A handler for the “settings://” URI scheme must be installed."

src/DaemonManager.vala

@@ -62,7 +62,9 @@ public class Gala.DaemonManager : GLib.Object {
                 break;
 
             case "MODAL":
-#if HAS_MUTTER46
+#if HAS_MUTTER49
+                window.set_type (Meta.WindowType.DOCK);
+#elif HAS_MUTTER46
                 client.wayland_client.make_dock (window);
 #endif
                 window.move_frame (false, 0, 0);

src/DesktopIntegration.vala

@@ -203,7 +203,11 @@ public class Gala.DesktopIntegration : GLib.Object {
 
         wm.get_display ().get_sound_player ().play_from_theme ("bell", _("Window has already focus"), null);
 
+#if HAS_MUTTER49
+        if (window.is_maximized ()) {
+#else
         if (window.get_maximized () == BOTH) {
+#endif
             notifying = false;
             return;
         }

src/KeyboardManager.vala

@@ -14,6 +14,9 @@ public class Gala.KeyboardManager : Object {
     public Meta.Display display { construct; private get; }
 
     private GLib.Settings settings;
+#if HAS_MUTTER49
+    private GLib.Cancellable? cancellable = null;
+#endif
 
     public KeyboardManager (Meta.Display display) {
         Object (display: display);
@@ -104,13 +107,49 @@ public class Gala.KeyboardManager : Object {
             var variant = string.joinv (",", variants);
             var options = string.joinv (",", xkb_options);
 
-#if HAS_MUTTER46
+#if HAS_MUTTER49
+            if (cancellable != null) {
+                cancellable.cancel ();
+                cancellable = new GLib.Cancellable ();
+            }
+
+            backend.set_keymap_async.begin (layout, variant, options, settings.get_string ("xkb-model"), cancellable, (obj, res) => {
+                try {
+                    ((Meta.Backend) obj).set_keymap_async.end (res);
+                } catch (Error e) {
+                    if (e is GLib.IOError.CANCELLED) {
+                        // ignore
+                    } else {
+                        cancellable = null;
+                    }
+                }
+            });
+#elif HAS_MUTTER46
             backend.set_keymap (layout, variant, options, settings.get_string ("xkb-model"));
 #else
             backend.set_keymap (layout, variant, options);
 #endif
         } else if (key == "current") {
+#if HAS_MUTTER49
+            if (cancellable != null) {
+                cancellable.cancel ();
+                cancellable = new GLib.Cancellable ();
+            }
+
+            backend.set_keymap_layout_group_async.begin (settings.get_uint ("current"), cancellable, (obj, res) => {
+                try {
+                    ((Meta.Backend) obj).set_keymap_layout_group_async.end (res);
+                } catch (Error e) {
+                    if (e is GLib.IOError.CANCELLED) {
+                        // ignore
+                    } else {
+                        cancellable = null;
+                    }
+                }
+            });
+#else
             backend.lock_layout_group (settings.get_uint ("current"));
+#endif
         }
     }
 }

src/ShellClients/HideTracker.vala

@@ -183,7 +183,7 @@ public class Gala.HideTracker : Object {
             }
 
             focus_overlap = true;
-            focus_maximized_overlap = VERTICAL in window.get_maximized ();
+            focus_maximized_overlap = window.maximized_vertically;
         }
 
         update_hidden ();