From d1fb70cf32e500d1e3fe7c5315647bee80086d34 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 5 Oct 2013 12:50:34 +0530 Subject: [PATCH] E-book viewer: Fix regression that broke import/export of bookmarks Fixes #1231980 [Calibre ePub Viewer: Importing bookmarks does not work](https://bugs.launchpad.net/calibre/+bug/1231980) --- src/calibre/gui2/viewer/bookmarkmanager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/viewer/bookmarkmanager.py b/src/calibre/gui2/viewer/bookmarkmanager.py index acd00c3a6f..3acba11392 100644 --- a/src/calibre/gui2/viewer/bookmarkmanager.py +++ b/src/calibre/gui2/viewer/bookmarkmanager.py @@ -100,7 +100,7 @@ class BookmarkManager(QDialog, Ui_BookmarkManager): bad = False try: for bm in imported: - if len(bm) != 2: + if 'title' not in bm: bad = True break except: @@ -109,9 +109,9 @@ class BookmarkManager(QDialog, Ui_BookmarkManager): if not bad: bookmarks = self.get_bookmarks() for bm in imported: - if bm not in bookmarks and bm['title'] != 'calibre_current_page_bookmark': + if bm not in bookmarks: bookmarks.append(bm) - self.set_bookmarks(bookmarks) + self.set_bookmarks([bm for bm in bookmarks if bm['title'] != 'calibre_current_page_bookmark']) if __name__ == '__main__': from PyQt4.Qt import QApplication