Merge branch 'lenemter/wingpanel-interface-focus-manager' of https://…

…github.com/elementary/greeter into lenemter/wingpanel-interface-focus-manager
elementary · Feb 14, 2024 · d503cd3 · d503cd3
2 parents 50d12c7 + 70df42a
commit d503cd3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/compositor/WingpanelManager/DBusWingpanelManager.vala b/compositor/WingpanelManager/DBusWingpanelManager.vala
@@ -18,7 +18,7 @@
  */
 
 [DBus (name = "org.pantheon.gala.WingpanelInterface")]
-public class GreeterCompositor.DBusWingpanelManager : Object {
+public class GreeterCompositor.DBusWingpanelManager : GLib.Object {
     private static DBusWingpanelManager? instance;
     private static WindowManager wm;
 

diff --git a/compositor/meson.build b/compositor/meson.build
@@ -65,14 +65,14 @@ mutter_typelib_dir = libmutter_dep.get_variable('typelibdir')
 
 # Here is the real Compositor work
 compositor_files = files(
-	'Background/Animation.vala',
-	'Background/Background.vala',
-	'Background/BackgroundCache.vala',
-	'Background/BackgroundContainer.vala',
-	'Background/BackgroundManager.vala',
-	'Background/BackgroundSource.vala',
-	'Background/BlurEffect.vala',
-	'Background/SystemBackground.vala',
+  'Background/Animation.vala',
+  'Background/Background.vala',
+  'Background/BackgroundCache.vala',
+  'Background/BackgroundContainer.vala',
+  'Background/BackgroundManager.vala',
+  'Background/BackgroundSource.vala',
+  'Background/BlurEffect.vala',
+  'Background/SystemBackground.vala',
   'WingpanelManager/WingpanelManager.vala',
   'WingpanelManager/DBusWingpanelManager.vala',
   'WingpanelManager/FocusManager.vala',