8000 Linux named notifications - 2-0-0 by ckerr · Pull Request #12229 · electron/electron · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Linux named notifications - 2-0-0 #12229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 13, 2018
Merged

Conversation

ckerr
Copy link
Member
@ckerr ckerr commented Mar 12, 2018

Cherry-picks the three sections of the linux notification cleanup:
5f48f91 bumps the docker images for libnotify in CI tests
86af20d is the main fix
dd2c266 handles an edge case and eliminates duplicate code

ckerr added 3 commits March 13, 2018 00:35
* Bump electronbuilds/electron* versions

The linux-appname branch has been gathering dust for awhile.
Some of the versions in `master` are higher, and some of the
versions in `linux-appname` are higher to add libnotify.

This commit takes the higher of the two numbers in each case.

* Add libnotify to the Dockerfiles
* Set name & desktop-entry on Linux notifications

* DBusMock now honors verbose mode flag

* Disable DBus Notification tests on ia32
* Fix desktop-id notification edge case

* Extract-method platform_util::GetDesktopName()

This removes duplicated code from libnotify_notifications.cc
and atom/common/linux/application_info.cc.

* Check for empty case in GetDesktopName().

* Move GetDesktopName() to brightray::util

* Remove unnecessary changes in platform_util

* Add a brightray::platform_util namespace
@ckerr ckerr requested review from a team March 12, 2018 15:46
@ckerr
Copy link
Member Author
ckerr commented Mar 12, 2018

The CI failure in macOS/pr-head is tracked at #12173

The CI failure in arm64/pr-head is tracked at #12233

Copy link
Member
@codebytere codebytere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that the failures are flakes, this looks good to me

@ckerr ckerr merged commit 176abdb into 2-0-x Mar 13, 2018
@ckerr ckerr deleted the linux-named-notifications_2-0-0 branch March 13, 2018 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0