Workaround Ubuntu 17.04 tray bug #576
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ConorIA
commented
Apr 15, 2017
electron/main.js
Outdated
| // Source: https://bugs.launchpad.net/ubuntu/+bug/1559249 | ||
| /////////////////////////////////////////////////////////////////////////////// | ||
| const de = process.env.XDG_CURRENT_DESKTOP; | ||
| if (de.includes('Unity')) { |
There was a problem hiding this comment.
There might be a better way to do this test. We need to change from Unity:Unity7 to Unity.
There was a problem hiding this comment.
Just skip using the variable de and instead process.env.XDG_CURRENT_DESKTOP.includes..
|
Went in with Virtualbox.
|
|
Looks good to me.. @mythsunwind wdyt? |
|
and @ffflorian :) |
|
To me too. Let's merge it before the new release. |
mythsunwind
approved these changes
Apr 18, 2017
Skip de variable
lipis
approved these changes
Apr 18, 2017
|
🍻 🇪🇺 🍺 🇨🇦 |
sidneys
added a commit
to sidneys/wire-desktop
that referenced
this pull request
May 5, 2017
* commit '2ee441781b6756c9b0071dc92efddf144c71ef9f': (34 commits) publish amplify event when deleting conversation Use libsodium-neon (wireapp#610) Release 2.13.2742 Bump electron to version '1.6.8' (wireapp#618) Preceed offline check when starting the app (wireapp#608) Prevent duplicate tray icon on update (wireapp#599) Release 2.13.2741 Fix debian pre/post-install scripts (wireapp#603) Release 2.13.2740 End app with exit on makeSingleInstance check (WEBAPP-3848) (wireapp#593) Bump electron version to 1.6.7 (wireapp#592) Remove testing URLs (wireapp#589) chore(package): update grunt-contrib-clean to version 1.1.0 (wireapp#570) check for XDG_CURRENT_DESKTOP (wireapp#587) Workaround Ubuntu 17.04 tray bug (wireapp#576) Make "unofficial" build options modular and dynamic (wireapp#568) Update release notes link (wireapp#573) Add repository for Debian/Ubuntu (wireapp#566) Release 2.13.2739 Rename package to wire-desktop (wireapp#550) ... # Conflicts: # package.json
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an untested workaround for #574 and #575. I have used the console.log, and the property does seem to be set. (though in my case I was changing
KDEtoUnity).If one of you has a working Zesty setup, please test. I've build a
.deb(x64) to save you from building. If no one has a 17.04 install, I can ask the reporter take it for a spin.If this does work, we should let the folks over at electron/electron#9046 know.