Two fixes for linux

* Linux: Change name of .desktop file to work around xdg-settings
* Reintroduce flashFrame on Linux, new --disable-flash-frame param
This commit is contained in:
Scott Nonnenberg 2019-10-10 11:51:16 -07:00
parent 2e2c5ebf9a
commit f790694559
2 changed files with 11 additions and 2 deletions

11
main.js
View file

@ -46,6 +46,8 @@ let tray = null;
const startInTray = process.argv.some(arg => arg === '--start-in-tray');
const usingTrayIcon =
startInTray || process.argv.some(arg => arg === '--use-tray-icon');
const disableFlashFrame =
startInTray || process.argv.some(arg => arg === '--disable-flash-frame');
const config = require('./app/config');
@ -906,7 +908,14 @@ ipc.on('add-setup-menu-items', () => {
});
ipc.on('draw-attention', () => {
if (process.platform === 'win32' && mainWindow) {
if (!mainWindow) {
return;
}
if (disableFlashFrame) {
return;
}
if (process.platform === 'win32' || process.platform === 'linux') {
mainWindow.flashFrame(true);
}
});

View file

@ -2,7 +2,7 @@
"name": "signal-desktop",
"productName": "Signal",
"description": "Private messaging from your desktop",
"desktopName": "signal-desktop.desktop",
"desktopName": "signal.desktop",
"repository": "https://github.com/signalapp/Signal-Desktop.git",
"version": "1.27.3-beta.2",
"license": "GPL-3.0",