Merge branch 'main' into lenemter/gtk4

Author: lenemter

config.vala.in

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

daemon/meson.build

@@ -12,9 +12,9 @@ granite_dep = dependency('granite-7')
 gala_daemon_bin = executable(
     'gala-daemon',
     gala_daemon_sources,
-    gala_resources,
     config_header,
+    gala_resources,
     dependencies: [granite_dep, gtk4_dep],
-    include_directories: include_directories('.'),
+    include_directories: config_inc_dir,
     install: true,
 )

docs/meson.build

@@ -53,6 +53,6 @@ all_doc_target = custom_target(
         '@INPUT@'
     ],
     build_by_default: true,
-    input: gala_lib_sources + gala_bin_sources + [ config_header ],
+    input: gala_lib_sources + gala_bin_sources + [config_header],
     output: 'full'
 )

lib/Drawing/StyleManager.vala

@@ -36,7 +36,7 @@ public class Gala.Drawing.StyleManager : Object {
 
     private static GLib.Once<StyleManager> instance;
     public static StyleManager get_instance () {
-        return instance.once (() => {return new StyleManager ();});
+        return instance.once (() => new StyleManager ());
     }
 
     public ColorScheme prefers_color_scheme { get; private set; default = LIGHT; }

meson.build

@@ -20,9 +20,8 @@ plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.proje
 conf = configuration_data()
 conf.set('GETTEXT_PACKAGE', meson.project_name())
 conf.set('LOCALEDIR', locale_dir)
-conf.set('VERSION', meson.project_version())
 conf.set('PLUGINDIR', plugins_dir)
-conf.set('RESOURCEPATH', '/org/pantheon/desktop/gala')
+conf.set('VERSION', meson.project_version())
 config_header = configure_file (
     input: 'config.vala.in',
     output: 'config.vala',

src/Background/BackgroundCache.vala

@@ -5,26 +5,17 @@
  */
 
 public class Gala.BackgroundCache : Object {
-    private static BackgroundCache? instance = null;
-
+    private static GLib.Once<BackgroundCache> instance;
     public static unowned BackgroundCache get_default () {
-        if (instance == null)
-            instance = new BackgroundCache ();
-
-        return instance;
+        return instance.once (() => new BackgroundCache ());
     }
 
     public signal void file_changed (string filename);
 
     private Gee.HashMap<string,FileMonitor> file_monitors;
     private BackgroundSource background_source;
-
     private Animation animation;
 
-    public BackgroundCache () {
-        Object ();
-    }
-
     construct {
         file_monitors = new Gee.HashMap<string,FileMonitor> ();
     }

src/PluginManager.vala

@@ -5,12 +5,9 @@
  */
 
 public class Gala.PluginManager : Object {
-    private static PluginManager? instance = null;
+    private static GLib.Once<PluginManager> instance;
     public static unowned PluginManager get_default () {
-        if (instance == null)
-            instance = new PluginManager ();
-
-        return instance;
+        return instance.once (() => new PluginManager ());
     }
 
     public delegate PluginInfo RegisterPluginFunction ();

src/Widgets/MultitaskingView/StaticWindowContainer.vala

@@ -12,7 +12,7 @@
 public class Gala.StaticWindowContainer : ActorTarget {
     private static GLib.Once<StaticWindowContainer> instance;
     public static StaticWindowContainer get_instance (Meta.Display display) {
-        return instance.once (() => { return new StaticWindowContainer (display); });
+        return instance.once (() => new StaticWindowContainer (display));
     }
 
     public signal void window_changed (Meta.Window window, bool is_static);

src/WindowDragProvider.vala

@@ -9,7 +9,7 @@
 public class Gala.WindowDragProvider : Object {
     private static GLib.Once<WindowDragProvider> instance;
     public static WindowDragProvider get_instance () {
-        return instance.once (() => { return new WindowDragProvider (); });
+        return instance.once (() => new WindowDragProvider ());
     }
 
     public signal void enter (uint64 window_id);