From 47d8e34dca408cb466da2b84d54b0e1390f55a9b Mon Sep 17 00:00:00 2001 From: Alexandru Rosianu Date: Sat, 13 Jun 2015 12:41:03 +0300 Subject: [PATCH 1/4] Enable chromium plugins (could fix crashes?) --- src/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/package.json b/src/package.json index 557939f7..2348c0f5 100644 --- a/src/package.json +++ b/src/package.json @@ -12,6 +12,9 @@ "toolbar": false, "show": false }, + "webkit": { + "plugin": true + }, "dependencies": { "async": "^1.0.0", "auto-launch": "^0.1.18", From cdf2cf830308397e2d00d830fe519290c5137a53 Mon Sep 17 00:00:00 2001 From: Alexandru Rosianu Date: Sat, 13 Jun 2015 12:53:32 +0300 Subject: [PATCH 2/4] Updates .gitignore --- .gitignore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3a71820e..6d227767 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/src/vendor/ -build/ -dist/ -cache/ +/build/ +/dist/ +/cache/ node_modules/ From b6dcf1489a513d7b86fe5133466b40c64abc1b23 Mon Sep 17 00:00:00 2001 From: Alexandru Rosianu Date: Sat, 13 Jun 2015 13:00:37 +0300 Subject: [PATCH 3/4] Fixes tray icon always appearing on OSX --- src/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index ffee9a8f..91f38514 100644 --- a/src/app.js +++ b/src/app.js @@ -36,11 +36,14 @@ if (settings.checkUpdateOnLaunch) { // Run as menu bar app if (settings.asMenuBarAppOSX) { win.setShowInTaskbar(false); + menus.loadTrayIcon(win); } // Load the app menus menus.loadMenuBar(win) -menus.loadTrayIcon(win); +if (platform.isLinux || platform.isWindows) { + menus.loadTrayIcon(win); +} // Adjust the default behaviour of the main window windowBehaviour.set(win); From 1e94fb0311450e54f7971fa8f524abc483febda6 Mon Sep 17 00:00:00 2001 From: Alexandru Rosianu Date: Sat, 13 Jun 2015 13:01:36 +0300 Subject: [PATCH 4/4] New version v1.4.2 --- CHANGELOG | 4 ++++ package.json | 2 +- src/package.json | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5a25756b..6468da80 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +1.4.2 +- Fixes tray icon always appearing on OSX +- Enables Chromium plugins (could fix calling crashes) + 1.4.1 - Show the linux tray icon (not tested) - Use native clipboard (nwjs) diff --git a/package.json b/package.json index 201dde32..92b297f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Messenger", - "version": "1.4.1", + "version": "1.4.2", "repository": { "type": "git", "url": "git@github.com:Aluxian/Facebook-Messenger-Desktop.git" diff --git a/src/package.json b/src/package.json index 2348c0f5..6187dd25 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "main": "app.html", "name": "Messenger", - "version": "1.4.1", + "version": "1.4.2", "app-id": "com.aluxian.messengerfordesktop", "chromium-args": "--disable-setuid-sandbox", "window": { @@ -24,9 +24,9 @@ }, "manifestUrl": "https://raw.githubusercontent.com/Aluxian/Facebook-Messenger-Desktop/master/src/package.json", "packages": { - "osx64": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.1/Messenger.dmg", - "win32": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.1/MessengerSetup.exe", - "linux32": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.1/Messenger_linux32.deb", - "linux64": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.1/Messenger_linux64.deb" + "osx64": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.2/Messenger.dmg", + "win32": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.2/MessengerSetup.exe", + "linux32": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.2/Messenger_linux32.deb", + "linux64": "https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/download/v1.4.2/Messenger_linux64.deb" } }