diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-10-29 10:38:32 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-10-29 10:38:32 +0100 |
| commit | 02942bb74ad8efa6f1ef255bd0802288032cdb30 (patch) | |
| tree | 5bd9433dea08468937d15a6ec110fd3834777ccc /gui/src/main | |
| parent | 3ab99dc9e117a8e245e37d996a6ece451d1f5cb0 (diff) | |
| parent | 0045a7601d72b4f64de1780c3912d9d19c315b5f (diff) | |
| download | mullvadvpn-02942bb74ad8efa6f1ef255bd0802288032cdb30.tar.xz mullvadvpn-02942bb74ad8efa6f1ef255bd0802288032cdb30.zip | |
Merge branch 'improve-eslint-rules' into master
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/linux-split-tunneling.ts | 1 |
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) { |