Merge branch 'main' into lenemter/rewrite-window-menu

Author: lenemter

.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,11 +27,11 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libcanberra-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc
+        apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-4-dev libgnome-bg-4-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc
     - name: Build
       env:
         DESTDIR: out
@@ -47,10 +47,10 @@ 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
+          dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-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
       - name: Build
         env:
           DESTDIR: out
@@ -69,8 +69,8 @@ jobs:
         run: |
           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
+          zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 clutter-devel libgee-devel glib2-devel libgnome-desktop-4-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
+      - 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,8 +10,8 @@ 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: elementary/actions/release@master
+     - uses: actions/checkout@v5
+     - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
          GIT_USER_NAME: "elementaryBot"

.gitignore

@@ -3,9 +3,6 @@ aclocal.m4
 autom4te.cache
 /build-aux/*
 ChangeLog
-config.h
-config.h.in
-config.h.in~
 config.log
 config.status
 configure

README.md

@@ -8,13 +8,15 @@ A window & compositing manager based on libmutter and designed by elementary for
 You'll need the following dependencies:
 * gettext (>= 0.19.6)
 * gsettings-desktop-schemas-dev
-* libcanberra-dev
 * libclutter-1.0-dev (>= 1.12.0)
 * libgee-0.8-dev
 * libglib2.0-dev (>= 2.74)
-* libgnome-desktop-3-dev
+* libgnome-desktop-4-dev
+* libgnome-bg-4-dev
 * libgranite-dev (>= 5.4.0)
-* libgtk-3-dev (>= 3.10.0)
+* libgranite-7-dev
+* libgtk-3-dev
+* libgtk-4-dev
 * libmutter-10-dev (>= 42.0) | libmutter-dev (>= 3.18.3)
 * meson (>= 0.59.0)
 * valac (>= 0.46.0)

config.vala.in

@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ *                         2011 Robert Dyer
+ *                         2011 Rico Tzschichholz
+ */
+
+namespace Config {
+	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+	public const string LOCALEDIR = "@LOCALEDIR@";
+	public const string VERSION = "@VERSION@";
+	public const string PLUGINDIR = "@PLUGINDIR@";
+}

daemon-gtk3/BackgroundMenu.vala

@@ -4,8 +4,8 @@
  */
 
 public class Gala.Daemon.BackgroundMenu : Gtk.Menu {
-    public const string ACTION_GROUP_PREFIX = "background-menu";
-    public const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
+    private const string ACTION_GROUP_PREFIX = "background-menu";
+    private const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
 
     construct {
         var change_wallpaper = new Gtk.MenuItem.with_label (_("Change Wallpaper…")) {

daemon-gtk3/meson.build

@@ -7,14 +7,14 @@ gala_daemon_sources = files(
     'BackgroundMenu.vala',
 )
 
-granite_dep_old = dependency('granite')
+granite6_dep = dependency('granite')
 hdy_dep = dependency('libhandy-1')
 
-gala_daemon_bin = executable(
+executable(
     'gala-daemon-gtk3',
     gala_daemon_sources,
-    gala_resources,
-    dependencies: [gala_dep, gala_base_dep, granite_dep_old, hdy_dep],
-    include_directories: config_inc_dir,
+    gala_common_enums,
+    config_header,
+    dependencies: [granite6_dep, hdy_dep],
     install: true,
 )

daemon/DBus.vala

@@ -17,6 +17,11 @@ public struct Gala.DaemonWindowMenuItem {
     string keybinding;
 }
 
+[DBus (name = "org.pantheon.gala")]
+public interface Gala.WMDBus : GLib.Object {
+    public abstract void perform_action (Gala.ActionType type) throws DBusError, IOError;
+}
+
 public struct Gala.Daemon.MonitorLabelInfo {
     public int monitor;
     public string label;
@@ -37,7 +42,7 @@ public class Gala.Daemon.DBus : GLib.Object {
     private const string BG_MENU_ACTION_GROUP_PREFIX = "background-menu";
     private const string BG_MENU_ACTION_PREFIX = BG_MENU_ACTION_GROUP_PREFIX + ".";
 
-public signal void window_menu_action_invoked (int action);
+    public signal void window_menu_action_invoked (int action);
 
     private Window window;
     private WindowMenu window_menu;

daemon/MonitorLabel.vala

@@ -4,7 +4,6 @@
  */
 
  public class Gala.Daemon.MonitorLabel : Gtk.Window {
-    private const int SPACING = 12;
     private const string COLORED_STYLE_CSS = """
     .%s {
         background-color: alpha(%s, 0.8);