Browse Source

Merge 0411b5f117 into 08554c83f5

pull/10/merge
Didier Spaier 6 years ago
committed by GitHub
parent
commit
ba292a9e96
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      src/xdgmenumaker

11
src/xdgmenumaker

@ -399,12 +399,11 @@ def get_entry_info(desktopfile, ico_paths=True):
notshowin = de.getNotShowIn()
hidden = de.getHidden()
nodisplay = de.getNoDisplay()
# none of the freedesktop registered environments are supported by
# OnlyShowIn anyway:
# http://standards.freedesktop.org/menu-spec/latest/apb.html
# So if OnlyShowIn is set, it certainly isn't for any of the WMs
# xdgmenumaker supports.
if (onlyshowin != []) or (desktop in notshowin) or hidden or nodisplay:
if 'XDG_CURRENT_DESKTOP' in os.environ and len(onlyshowin) >0 and not os.environ['XDG_CURRENT_DESKTOP'] in onlyshowin:
return None
if 'XDG_CURRENT_DESKTOP' in os.environ and len(notshowin) >0 and os.environ['XDG_CURRENT_DESKTOP'] in notshowin:
return None
if hidden or nodisplay:
return None
name = de.getName().encode('utf-8')

Loading…
Cancel
Save