Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/muktupavels/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2017-12-29 17:41:46 +05:30
commit f9822e35cc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/dbus_export/menu.py
View File

@ -237,7 +237,7 @@ class DBusMenu(QObject):
return parent_id, props, self.get_layout_children(parent_id, depth, property_names) return parent_id, props, self.get_layout_children(parent_id, depth, property_names)
def get_layout_children(self, 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) ac = self.id_to_action(parent_id)
if ac is not None and depth != 0 and ac.menu() is not None: if ac is not None and depth != 0 and ac.menu() is not None:
for child in menu_actions(ac.menu()): for child in menu_actions(ac.menu()):

2
src/calibre/gui2/dbus_export/tray.py
View File

@ -192,7 +192,7 @@ class StatusNotifierItemAPI(Object):
def Menu(self): def Menu(self):
return dbus.ObjectPath(self.dbus_menu.object_path) return dbus.ObjectPath(self.dbus_menu.object_path)
@dbus_property(IFACE, signature='i') @dbus_property(IFACE, signature='u')
def WindowId(self): def WindowId(self):
return 0 return 0