Skip to content
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

Jump to bottom

wire-desktop: Fix StartupWMClass #83274

Merged
merged 1 commit into from Mar 26, 2020
Merged

wire-desktop: Fix StartupWMClass #83274

merged 1 commit into from Mar 26, 2020

Conversation

arianvp
Copy link
Member

@arianvp arianvp commented Mar 24, 2020 •
edited

With quotes it doesn't match the Wire's window name, causing the window to not be grouped under its icon in Gnome.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@arianvp
wire-desktop: Fix StartupWMClass
da587da 
With quotes it doesn't match the Wire's screen, causing the window to not be grouped under its icon in Gnome.
@ofborg ofborg bot requested review from Kiwi, worldofpeace and toonn March 24, 2020 10:31
@arianvp
Copy link
Member Author

arianvp commented Mar 24, 2020

@GrahamcOfBorg build wire-desktop

toonn
toonn approved these changes Mar 24, 2020
View reviewed changes
Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

I can't test this change because of the platform. But some searching around does seem to indicate the string should not be quoted. This is not explicitly called out in the freedesktop specification but can be read between the lines, all ASCII characters allowed, no info about escaping quotes.

@worldofpeace
Copy link
Contributor

It seemed to work with GNOME wayland session, are you using xorg @arianvp?

@arianvp
Copy link
Member Author

arianvp commented Mar 24, 2020

I'm using Wayland on 19.09 and without this change I always get a detached window
Wire 2020-03-24 at 10 32 54

With this change that goes away

@jtojnar
Copy link
Contributor

jtojnar commented Mar 24, 2020

Yeah, quotes are valid characters to use within string values. They are useful for example when passing arguments containing space as part of Exec key.

jtojnar
jtojnar approved these changes Mar 24, 2020
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Did not verify that Wire is the proper WMClass but quotes are almost surely not part of it.

@worldofpeace worldofpeace merged commit 9127e02 into NixOS:master Mar 26, 2020
@worldofpeace
Copy link
Contributor

backported to 20.03 in 01c61f3
backported to 19.09 df07596

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

@toonn toonn toonn approved these changes

@Kiwi Kiwi Awaiting requested review from Kiwi

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@arianvp @worldofpeace @jtojnar @toonn