Merge branch 'fix-xfce-window-icon'

2 files changed, 6 insertions, 6 deletions

diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index f9cff36663..73019b1e14 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -20,7 +20,7 @@ import { ICurrentAppVersionInfo } from '../main';
 import { loadTranslations, messages, relayLocations } from '../shared/gettext';
 import { IGuiSettingsState, SYSTEM_PREFERRED_LOCALE_KEY } from '../shared/gui-settings-state';
 import { IpcRendererEventChannel, IRelayListPair } from '../shared/ipc-event-channel';
-import ISplitTunnelingApplication from '../shared/linux-split-tunneling-application';
+import { ILinuxSplitTunnelingApplication } from '../shared/application-types';
 import { getRendererLogFile, setupLogging } from '../shared/logging';
 import consumePromise from '../shared/promise';
 import History from './lib/history';
@@ -416,7 +416,7 @@ export default class AppRenderer {
     return IpcRendererEventChannel.splitTunneling.getApplications();
   }
 
-  public launchExcludedApplication(application: ISplitTunnelingApplication | string) {
+  public launchExcludedApplication(application: ILinuxSplitTunnelingApplication | string) {
     consumePromise(IpcRendererEventChannel.splitTunneling.launchApplication(application));
   }
 
diff --git a/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx b/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx
index 145fb5a032..3c07e7eca0 100644
--- a/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx
@@ -4,7 +4,7 @@ import { sprintf } from 'sprintf-js';
 import styled from 'styled-components';
 import { colors } from '../../config.json';
 import { messages } from '../../shared/gettext';
-import ISplitTunnelingApplication from '../../shared/linux-split-tunneling-application';
+import { ILinuxSplitTunnelingApplication } from '../../shared/application-types';
 import consumePromise from '../../shared/promise';
 import { useAppContext } from '../context';
 import * as AppButton from './AppButton';
@@ -104,7 +104,7 @@ export default function LinuxSplitTunnelingSettings() {
   } = useAppContext();
   const history = useHistory();
 
-  const [applications, setApplications] = useState<ISplitTunnelingApplication[]>();
+  const [applications, setApplications] = useState<ILinuxSplitTunnelingApplication[]>();
   const [applicationListHeight, setApplicationListHeight] = useState<number>();
   const [browsing, setBrowsing] = useState(false);
 
@@ -202,8 +202,8 @@ export default function LinuxSplitTunnelingSettings() {
 }
 
 interface IApplicationRowProps {
-  application: ISplitTunnelingApplication;
-  launchApplication: (application: ISplitTunnelingApplication) => void;
+  application: ILinuxSplitTunnelingApplication;
+  launchApplication: (application: ILinuxSplitTunnelingApplication) => void;
 }
 
 function ApplicationRow(props: IApplicationRowProps) {