From f625ecc8616d843eb4c76b43e4090c84a99345a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Fri, 29 Dec 2017 12:09:47 +0200 Subject: [PATCH 1/2] dbus_export: fix get_layout_children array signature GetLayout method should return layout as `(ia{sv}av)` not `(ia{sv}a(ia{sv}av))`. --- src/calibre/gui2/dbus_export/menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/dbus_export/menu.py b/src/calibre/gui2/dbus_export/menu.py index 6b682625a2..38c013b7de 100644 --- a/src/calibre/gui2/dbus_export/menu.py +++ b/src/calibre/gui2/dbus_export/menu.py @@ -237,7 +237,7 @@ class DBusMenu(QObject): return parent_id, props, self.get_layout_children(parent_id, depth, property_names) def get_layout_children(self, parent_id, depth, property_names): - ans = dbus.Array(signature='(ia{sv}av)') + ans = dbus.Array(signature='v') ac = self.id_to_action(parent_id) if ac is not None and depth != 0 and ac.menu() is not None: for child in menu_actions(ac.menu()): From 10a02db64baddb577e938cc1747f799d2777d0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Fri, 29 Dec 2017 12:26:30 +0200 Subject: [PATCH 2/2] dbus_export: fix WindowId property signature It should be unsigned int. --- src/calibre/gui2/dbus_export/tray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/dbus_export/tray.py b/src/calibre/gui2/dbus_export/tray.py index 85e02a0a85..07483de1e6 100644 --- a/src/calibre/gui2/dbus_export/tray.py +++ b/src/calibre/gui2/dbus_export/tray.py @@ -192,7 +192,7 @@ class StatusNotifierItemAPI(Object): def Menu(self): return dbus.ObjectPath(self.dbus_menu.object_path) - @dbus_property(IFACE, signature='i') + @dbus_property(IFACE, signature='u') def WindowId(self): return 0