From 048002a617d643b61774d69edee1526d4c7adbdf Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Wed, 13 Nov 2024 11:38:16 -0500
Subject: [PATCH] Changes to get everything working in citadel build

---
 data/com.subgraph.citadel.Realms.desktop |  2 +-
 data/meson.build                         | 11 ++++++++++-
 js/model/RealmManager.js                 |  4 ++--
 meson.build                              |  1 +
 src/com.subgraph.citadel.Realms.js       |  2 +-
 src/meson.build                          |  1 -
 src/model/RealmManager.ts                |  5 ++---
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/data/com.subgraph.citadel.Realms.desktop b/data/com.subgraph.citadel.Realms.desktop
index fedaa60..cbbdb99 100644
--- a/data/com.subgraph.citadel.Realms.desktop
+++ b/data/com.subgraph.citadel.Realms.desktop
@@ -3,4 +3,4 @@ Name=Realms
 Type=Application
 Exec=com.subgraph.citadel.Realms
 Terminal=false
-Icon=com.subgraph.citadel.Realms
+Icon=/usr/share/icons/com.subgraph.Realms.png
diff --git a/data/meson.build b/data/meson.build
index 3e063a8..d50f114 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,6 +16,15 @@ blueprints = custom_target('blueprints',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
 )
 
+desktop_file = i18n.merge_file(
+  input: 'com.subgraph.citadel.Realms.desktop',
+  output: 'com.subgraph.citadel.Realms.desktop',
+  type: 'desktop',
+  po_dir: '../po',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'applications')
+)
+
 gnome.compile_resources(
   APP_ID + '.data',
   APP_ID + '.data.gresource.xml',
@@ -25,6 +34,6 @@ gnome.compile_resources(
   dependencies: blueprints,
 )
 
-install_data('icons/com.subgraph.Realms.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/512x512/apps'))
+install_data('icons/com.subgraph.Realms.png', install_dir: join_paths(get_option('datadir'), 'icons'))
 
 
diff --git a/js/model/RealmManager.js b/js/model/RealmManager.js
index 51969d8..37e4ad4 100644
--- a/js/model/RealmManager.js
+++ b/js/model/RealmManager.js
@@ -7,7 +7,7 @@ import { LabelColorManager } from './LabelColors.js';
 const Signals = imports.signals;
 const RealmIface = loadInterfaceXML("com.subgraph.realms.Realm");
 const RealmFSIface = loadInterfaceXML("com.subgraph.realms.RealmFS");
-const BUS_NAME = 'com.subgraph.Realms2';
+const BUS_NAME = 'com.subgraph.realms';
 const OBJECT_PATH = '/com/subgraph/Realms2';
 const ManagerInterface = loadInterfaceXML("com.subgraph.realms.Manager2");
 const ManagerProxy = Gio.DBusProxy.makeProxyWrapper(ManagerInterface);
@@ -23,7 +23,7 @@ export class RealmManager {
         this._realmfs = {};
         this._objectManager = new ObjectManager({
             connection: Gio.DBus.system,
-            name: 'com.subgraph.Realms2',
+            name: BUS_NAME,
             objectPath: '/com/subgraph/Realms2',
             knownInterfaces: [RealmIface, RealmFSIface],
             onLoaded: this._onLoaded.bind(this),
diff --git a/meson.build b/meson.build
index 3abee6f..f6e31ee 100644
--- a/meson.build
+++ b/meson.build
@@ -8,6 +8,7 @@ project(
 APP_ID = 'com.subgraph.citadel.Realms'
 
 gnome = import('gnome')
+i18n = import('i18n')
 
 #tsc = find_program('tsc', required: true)
 
diff --git a/src/com.subgraph.citadel.Realms.js b/src/com.subgraph.citadel.Realms.js
index 943101d..4136763 100644
--- a/src/com.subgraph.citadel.Realms.js
+++ b/src/com.subgraph.citadel.Realms.js
@@ -1,4 +1,4 @@
-#!@GJS@ -m
+#!/usr/bin/env -S gjs -m
 
 import GLib from 'gi://GLib'
 
diff --git a/src/meson.build b/src/meson.build
index b377c79..48dca28 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,7 +2,6 @@ configure_file(
   input: APP_ID + '.js',
   output: APP_ID,
   configuration: {
-    'GJS': find_program('gjs').full_path(),
     'PACKAGE_NAME': APP_ID,
     'PACKAGE_VERSION': meson.project_version(),
     'PREFIX': get_option('prefix'),
diff --git a/src/model/RealmManager.ts b/src/model/RealmManager.ts
index 5a33e51..af4e959 100644
--- a/src/model/RealmManager.ts
+++ b/src/model/RealmManager.ts
@@ -13,7 +13,7 @@ const Signals = imports.signals;
 const RealmIface = loadInterfaceXML("com.subgraph.realms.Realm");
 const RealmFSIface = loadInterfaceXML("com.subgraph.realms.RealmFS");
 
-const BUS_NAME = 'com.subgraph.Realms2';
+const BUS_NAME = 'com.subgraph.realms';
 const OBJECT_PATH = '/com/subgraph/Realms2';
 const ManagerInterface = loadInterfaceXML("com.subgraph.realms.Manager2");
 const ManagerProxy = Gio.DBusProxy.makeProxyWrapper(ManagerInterface);
@@ -33,7 +33,6 @@ export class RealmManager {
     private _labelColors: LabelColorManager;
     private _proxy: Gio.DBusProxy;
 
-    
     static instance(): RealmManager {
         return RealmManager.INSTANCE;
     }
@@ -43,7 +42,7 @@ export class RealmManager {
 
         this._objectManager = new ObjectManager({
             connection: Gio.DBus.system,
-            name: 'com.subgraph.Realms2',
+            name: BUS_NAME,
             objectPath: '/com/subgraph/Realms2',
             knownInterfaces: [RealmIface, RealmFSIface],
             onLoaded: this._onLoaded.bind(this),