Merge branch 'fix-xfce-window-icon'

3 files changed, 25 insertions, 12 deletions

diff --git a/gui/src/shared/application-types.ts b/gui/src/shared/application-types.ts
new file mode 100644
index 0000000000..91b8068072
--- /dev/null
+++ b/gui/src/shared/application-types.ts
@@ -0,0 +1,22 @@
+type Warning = 'launches-in-existing-process' | 'launches-elsewhere';
+
+export interface IApplication {
+  absolutepath: string;
+  name: string;
+  icon?: string;
+}
+
+export interface ILinuxApplication extends IApplication {
+  exec: string;
+  type: string;
+  terminal?: string;
+  noDisplay?: string;
+  hidden?: string;
+  onlyShowIn?: string | string[];
+  notShowIn?: string | string[];
+  tryExec?: string;
+}
+
+export interface ILinuxSplitTunnelingApplication extends ILinuxApplication {
+  warning?: Warning;
+}
diff --git a/gui/src/shared/ipc-event-channel.ts b/gui/src/shared/ipc-event-channel.ts
index 1524e24bba..58186a822d 100644
--- a/gui/src/shared/ipc-event-channel.ts
+++ b/gui/src/shared/ipc-event-channel.ts
@@ -1,6 +1,6 @@
 import { ICurrentAppVersionInfo } from '../main/index';
 import { IWindowShapeParameters } from '../main/window-controller';
-import ISplitTunnelingApplication from '../shared/linux-split-tunneling-application';
+import { ILinuxSplitTunnelingApplication } from '../shared/application-types';
 import {
   AccountToken,
   BridgeSettings,
@@ -175,8 +175,8 @@ const ipc = {
     verifyKey: invoke<void, boolean>(),
   },
   splitTunneling: {
-    getApplications: invoke<void, ISplitTunnelingApplication[]>(),
-    launchApplication: invoke<ISplitTunnelingApplication | string, void>(),
+    getApplications: invoke<void, ILinuxSplitTunnelingApplication[]>(),
+    launchApplication: invoke<ILinuxSplitTunnelingApplication | string, void>(),
   },
   problemReport: {
     collectLogs: invoke<string[], string>(),
diff --git a/gui/src/shared/linux-split-tunneling-application.ts b/gui/src/shared/linux-split-tunneling-application.ts
deleted file mode 100644
index a96152b70d..0000000000
--- a/gui/src/shared/linux-split-tunneling-application.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-type Warning = 'launches-in-existing-process' | 'launches-elsewhere';
-
-export default interface ISplitTunnelingApplication {
-  absolutepath: string;
-  name: string;
-  exec: string;
-  icon?: string;
-  warning?: Warning;
-}