Merge pull request #130 from Aluxian/develop

Merge develop 1.4.2
aluxian · Jun 13, 2015 · 5da6d9a · 5da6d9a
2 parents ff6c2b7 + 1e94fb0
commit 5da6d9a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-/src/vendor/
-build/
-dist/
-cache/
+/build/
+/dist/
+/cache/
 node_modules/
diff --git 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
@@ -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/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);

diff --git 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": {
@@ -12,6 +12,9 @@
     "toolbar": false,
     "show": false
   },
+  "webkit": {
+    "plugin": true
+  },
   "dependencies": {
     "async": "^1.0.0",
     "auto-launch": "^0.1.18",
@@ -21,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"
   }
 }