diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py index 192c3e7fdb..ea8d604dd5 100644 --- a/src/calibre/devices/hanvon/driver.py +++ b/src/calibre/devices/hanvon/driver.py @@ -23,7 +23,7 @@ class N516(USBMS): VENDOR_ID = [0x0525] PRODUCT_ID = [0xa4a5] - BCD = [0x323] + BCD = [0x323, 0x326] VENDOR_NAME = 'INGENIC' WINDOWS_MAIN_MEM = '_FILE-STOR_GADGE' diff --git a/src/calibre/gui2/notify.py b/src/calibre/gui2/notify.py index 76f32c5ce6..009f94c4c3 100644 --- a/src/calibre/gui2/notify.py +++ b/src/calibre/gui2/notify.py @@ -85,6 +85,8 @@ class QtNotifier(Notifier): def __call__(self, body, summary=None, replaces_id=None, timeout=0): timeout, body, summary = self.get_msg_parms(timeout, body, summary) if self.systray is not None: + if isosx and isinstance(body, unicode): + body = body.encode('utf-8') self.systray.showMessage(summary, body, self.systray.Information, timeout) @@ -127,10 +129,10 @@ def get_notifier(systray=None): ans = FDONotifier() if not ans.ok: ans = None - if isosx: - ans = GrowlNotifier() - if not ans.ok: - ans = None + #if isosx: + # ans = GrowlNotifier() + # if not ans.ok: + # ans = None if ans is None: ans = QtNotifier(systray) if not ans.ok: