d919a4253c
- Use pytest to run tests rather than nose that will break with python 3.10 * new-api.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=21
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
diff --git a/xdg/Menu.py b/xdg/Menu.py
|
|
index 1d03cad591668f8297882ad8ff3656fbc8062ff1..c27eee2b054f903ae66727dcaee5563f3bebf8ee 100644
|
|
--- a/xdg/Menu.py
|
|
+++ b/xdg/Menu.py
|
|
@@ -298,11 +298,11 @@ class Menu:
|
|
entry.Show = NO_EXEC
|
|
self.Visible -= 1
|
|
elif xdg.Config.windowmanager:
|
|
- if (entry.DesktopEntry.OnlyShowIn != [] and (
|
|
- xdg.Config.windowmanager not in entry.DesktopEntry.OnlyShowIn
|
|
+ if (entry.DesktopEntry.getOnlyShowIn() != [] and (
|
|
+ xdg.Config.windowmanager not in entry.DesktopEntry.getOnlyShowIn()
|
|
)
|
|
) or (
|
|
- xdg.Config.windowmanager in entry.DesktopEntry.NotShowIn
|
|
+ xdg.Config.windowmanager in entry.DesktopEntry.getNotShowIn()
|
|
):
|
|
entry.Show = NOT_SHOW_IN
|
|
self.Visible -= 1
|
|
@@ -994,8 +994,8 @@ class XMLMenuBuilder(object):
|
|
menuentry = MenuEntry(directory, dir)
|
|
if not menu.Directory:
|
|
menu.Directory = menuentry
|
|
- elif menuentry.Type == MenuEntry.TYPE_SYSTEM:
|
|
- if menu.Directory.Type == MenuEntry.TYPE_USER:
|
|
+ elif menuentry.getType() == MenuEntry.TYPE_SYSTEM:
|
|
+ if menu.Directory.getType() == MenuEntry.TYPE_USER:
|
|
menu.Directory.Original = menuentry
|
|
if menu.Directory:
|
|
break
|