From 57064588c09e4c494d19c0ceece1c45267120fc7 Mon Sep 17 00:00:00 2001
From: Andy Holmes <andrew.g.r.holmes@gmail.com>
Date: Sun, 2 Aug 2020 14:44:06 -0700
Subject: [PATCH] move DBus interface loading from _gsconnect.js

---
 src/_gsconnect.js       | 9 ---------
 src/service/__init__.js | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/_gsconnect.js b/src/_gsconnect.js
index 569d31972..1e9452ac4 100644
--- a/src/_gsconnect.js
+++ b/src/_gsconnect.js
@@ -140,15 +140,6 @@ gsconnect.get_resource = function(rel_path) {
 };
 
 
-/**
- * DBus Interface Introspection
- */
-gsconnect.dbusinfo = Gio.DBusNodeInfo.new_for_xml(
-    gsconnect.get_resource(`${gsconnect.app_id}.xml`)
-);
-gsconnect.dbusinfo.nodes.forEach(info => info.cache_build());
-
-
 /**
  * Install desktop files for user installs
  */
diff --git a/src/service/__init__.js b/src/service/__init__.js
index 8fb02a3a4..de2089e39 100644
--- a/src/service/__init__.js
+++ b/src/service/__init__.js
@@ -16,6 +16,15 @@ globalThis.HAVE_REMOTEINPUT = GLib.getenv('GDMSESSION') !== 'ubuntu-wayland';
 globalThis.HAVE_WAYLAND = GLib.getenv('XDG_SESSION_TYPE') === 'wayland';
 
 
+/*
+ * DBus Interface Introspection
+ */
+gsconnect.dbusinfo = Gio.DBusNodeInfo.new_for_xml(
+    gsconnect.get_resource(`${gsconnect.app_id}.xml`)
+);
+gsconnect.dbusinfo.nodes.forEach(info => info.cache_build());
+
+
 /**
  * A custom debug function that logs at LEVEL_MESSAGE to avoid the need for env
  * variables to be set.