Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-20 02:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert Linux GTK version workaround

Browse Source
This commit is contained in:
ayumi-signal
2025-10-06 10:02:21 -07:00
committed by GitHub
parent bc8fba61ea
commit 2af0795347
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main.ts
View File

@@ -2004,11 +2004,6 @@ const featuresToDisable = `HardwareMediaKeyHandling,${app.commandLine.getSwitchV
)}`; )}`;
app.commandLine.appendSwitch('disable-features', featuresToDisable); app.commandLine.appendSwitch('disable-features', featuresToDisable);
if (OS.isLinux()) {
// https://github.com/electron/electron/issues/46538#issuecomment-2808806722
app.commandLine.appendSwitch('gtk-version', '3');
}
// This has to run before the 'ready' event. // This has to run before the 'ready' event.
electronProtocol.registerSchemesAsPrivileged([ electronProtocol.registerSchemesAsPrivileged([
{ {

2
package.json
View File

@@ -48,7 +48,7 @@
"test": "run-s test-node test-electron test-lint-intl test-eslint", "test": "run-s test-node test-electron test-lint-intl test-eslint",
"test-electron": "node ts/scripts/test-electron.js", "test-electron": "node ts/scripts/test-electron.js",
"test-release": "node ts/scripts/test-release.js", "test-release": "node ts/scripts/test-release.js",
"test-node": "cross-env LANG=en-us electron-mocha --timeout 10000 --main test/fix-linux-gtk.js --file test/setup-test-node.js --recursive ts/test-node", "test-node": "cross-env LANG=en-us electron-mocha --timeout 10000 --file test/setup-test-node.js --recursive ts/test-node",
"test-mock": "node ts/scripts/mocha-separator.js --require ts/test-mock/setup-ci.js -- ts/test-mock/**/*_test.js", "test-mock": "node ts/scripts/mocha-separator.js --require ts/test-mock/setup-ci.js -- ts/test-mock/**/*_test.js",
"test-mock-docker": "mocha --require ts/test-mock/setup-ci.js ts/test-mock/**/*_test.docker.js", "test-mock-docker": "mocha --require ts/test-mock/setup-ci.js ts/test-mock/**/*_test.docker.js",
"test-eslint": "mocha .eslint/rules/**/*.test.js --ignore-leaks", "test-eslint": "mocha .eslint/rules/**/*.test.js --ignore-leaks",

11
test/fix-linux-gtk.js
View File

@@ -1,11 +0,0 @@
// Copyright 2025 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
const { app } = require('electron');
if (process.platform === 'linux') {
// eslint-disable-next-line no-console
console.log('Applying electron switch for Linux GTK version --gtk-version=3');
// https://github.com/electron/electron/issues/46538#issuecomment-2808806722
app.commandLine.appendSwitch('gtk-version', '3');
}