summaryrefslogtreecommitdiffhomepage
path: root/gui/src/main
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-10-27 21:35:50 +0100
committerOskar Nyberg <oskar@mullvad.net>2020-10-29 10:31:27 +0100
commit4054d991750fda30d3749ce11faed0f29dd35d08 (patch)
tree9d25301d4ca4b547ea443d79baf7cef9eeb8ea62 /gui/src/main
parent3ab99dc9e117a8e245e37d996a6ece451d1f5cb0 (diff)
downloadmullvadvpn-4054d991750fda30d3749ce11faed0f29dd35d08.tar.xz
mullvadvpn-4054d991750fda30d3749ce11faed0f29dd35d08.zip
Add ESLint naming convention rule
Diffstat (limited to 'gui/src/main')
-rw-r--r--gui/src/main/daemon-rpc.ts2
-rw-r--r--gui/src/main/linux-split-tunneling.ts1
2 files changed, 3 insertions, 0 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 006dd12866..78dae947a0 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -210,12 +210,14 @@ export class DaemonRpc {
}
private channelOptions(): grpc.ClientOptions {
+ /* eslint-disable @typescript-eslint/naming-convention */
return {
'grpc.max_reconnect_backoff_ms': 3000,
'grpc.initial_reconnect_backoff_ms': 3000,
'grpc.keepalive_time_ms': Math.pow(2, 30),
'grpc.keepalive_timeout_ms': Math.pow(2, 30),
};
+ /* eslint-enable @typescript-eslint/naming-convention */
}
private connectivityChangeCallback(timeoutErr?: Error) {
diff --git a/gui/src/main/linux-split-tunneling.ts b/gui/src/main/linux-split-tunneling.ts
index b2b8c54de8..71f9f76eba 100644
--- a/gui/src/main/linux-split-tunneling.ts
+++ b/gui/src/main/linux-split-tunneling.ts
@@ -133,6 +133,7 @@ function getGtkThemeDirectories(): Promise<DirectoryDescription[]> {
process.env.ORIGINAL_XDG_CURRENT_DESKTOP ?? process.env.XDG_CURRENT_DESKTOP ?? '';
child_process.exec(
'gsettings get org.gnome.desktop.interface icon-theme',
+ // eslint-disable-next-line @typescript-eslint/naming-convention
{ env: { XDG_CURRENT_DESKTOP: xdgCurrentDesktop } },
(error, stdout) => {
if (error) {