From b108bfadeee31fda5fa54fd1559540c3146b6142 Mon Sep 17 00:00:00 2001 From: GRiker Date: Sat, 12 Oct 2013 05:16:25 -0600 Subject: [PATCH 1/2] Fixed typo in diagnostic --- src/calibre/devices/idevice/libimobiledevice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/devices/idevice/libimobiledevice.py b/src/calibre/devices/idevice/libimobiledevice.py index 213d7f9699..c1cf444194 100644 --- a/src/calibre/devices/idevice/libimobiledevice.py +++ b/src/calibre/devices/idevice/libimobiledevice.py @@ -274,7 +274,7 @@ class libiMobileDevice(): dst.write(data) bytes_remaining = 0 else: - self._log("copying %d {:,} bytes".format(file_size)) + self._log("copying {:,} bytes".format(file_size)) data = self._afc_file_read(handle, file_size, mode) dst.write(data) From 9f011a37a79fe0ff3cb1fc78f7876fad34215fd4 Mon Sep 17 00:00:00 2001 From: GRiker Date: Fri, 18 Oct 2013 15:54:32 -0600 Subject: [PATCH 2/2] Fix for lp:1241515, allow unicode catalog titles when saving presets. --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 3f938d523e..53d1b266f1 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -287,7 +287,7 @@ class PluginWidget(QWidget,Ui_Form): if child.objectName() == 'format': current_format = str(child.currentText()).strip() elif child.objectName() == 'title': - current_title = str(child.text()).strip() + current_title = unicode(child.text()).strip() self.parentWidget().blockSignals(False) return current_format, current_title