Move desktopintegration into own file

elementary · Apr 4, 2024 · 0a1c0bd · 0a1c0bd
1 parent f0930e6
commit 0a1c0bd
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 26 deletions.
diff --git a/src/Background/Portal.vala b/src/Background/Portal.vala
@@ -3,21 +3,6 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-[DBus (name = "org.pantheon.gala.DesktopIntegration")]
-private interface Gala.DesktopIntegration : Object {
-    public signal void running_applications_changed ();
-
-    public const string NAME = "org.pantheon.gala";
-    public const string PATH = "/org/pantheon/gala/DesktopInterface";
-
-    public struct RunningApplications {
-        string app_id;
-        HashTable<string,Variant> details;
-    }
-
-    public abstract async RunningApplications[] get_running_applications () throws DBusError, IOError;
-}
-
 [DBus (name = "org.freedesktop.impl.portal.Background")]
 public class Background.Portal : Object {
     public signal void running_applications_changed ();
@@ -28,18 +13,13 @@ public class Background.Portal : Object {
     public Portal (DBusConnection connection) {
         this.connection = connection;
 
-        connection.get_proxy.begin<Gala.DesktopIntegration> (
-            Gala.DesktopIntegration.NAME,
-            Gala.DesktopIntegration.PATH,
-            NONE, null, (obj, res) => {
-                try {
-                    desktop_integration = connection.get_proxy.end (res);
-                    desktop_integration.running_applications_changed.connect (() => running_applications_changed ());
-                } catch {
-                    warning ("Cannot connect to compositor, portal working with reduced functionality.");
-                }
+        Gala.DesktopIntegration.get_instance.begin ((obj, res) => {
+            desktop_integration = Gala.DesktopIntegration.get_instance.end (res);
+
+            if (desktop_integration != null) {
+                desktop_integration.running_applications_changed.connect (() => running_applications_changed ());
             }
-        );
+        });
     }
 
     [CCode (type_signature = "u")]

diff --git a/src/DesktopIntegration.vala b/src/DesktopIntegration.vala
@@ -0,0 +1,36 @@
+[DBus (name = "org.pantheon.gala.DesktopIntegration")]
+public interface Gala.DesktopIntegration : Object {
+    public struct RunningApplications {
+        string app_id;
+        HashTable<string, Variant> details;
+    }
+
+    public struct Window {
+        uint64 uid;
+        HashTable<string, Variant> details;
+    }
+
+    private const string NAME = "org.pantheon.gala";
+    private const string PATH = "/org/pantheon/gala/DesktopInterface";
+
+    public signal void running_applications_changed ();
+
+    public abstract async RunningApplications[] get_running_applications () throws DBusError, IOError;
+    public abstract async Window[] get_windows () throws DBusError, IOError;
+
+    private static Gala.DesktopIntegration? instance;
+
+    public static async Gala.DesktopIntegration? get_instance () {
+        if (instance != null) {
+            return instance;
+        }
+
+        try {
+            instance = yield Bus.get_proxy (SESSION, NAME, PATH);
+        } catch (Error e) {
+            warning ("Cannot connect to compositor, portal working with reduced functionality.");
+        }
+
+        return instance;
+    }
+}
diff --git a/src/meson.build b/src/meson.build
@@ -17,6 +17,7 @@ executable(
     'ScreenCast/Session.vala',
     'Wallpaper/Portal.vala',
     configure_file(input: 'Config.vala.in', output: '@BASENAME@', configuration: conf_data),
+    'DesktopIntegration.vala',
     'ExternalWindow.vala',
     'XdgDesktopPortalPantheon.vala',
     dependencies: [