From 5e98eb1d29c96a3d82a7576f7ad9f6c950783581 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 14 Aug 2009 10:27:47 -0600 Subject: [PATCH] IGN:Fix typo that was preventing EPUB Output from working in absence of X server --- src/calibre/ebooks/epub/output.py | 3 +-- src/calibre/gui2/__init__.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/epub/output.py b/src/calibre/ebooks/epub/output.py index ef1b9db088..986d1bff24 100644 --- a/src/calibre/ebooks/epub/output.py +++ b/src/calibre/ebooks/epub/output.py @@ -161,10 +161,8 @@ class EPUBOutput(OutputFormatPlugin): ) split(self.oeb, self.opts) - self.workaround_ade_quirks() self.workaround_webkit_quirks() - from calibre.ebooks.oeb.transforms.rescale import RescaleImages RescaleImages()(oeb, opts) self.insert_cover() @@ -194,6 +192,7 @@ class EPUBOutput(OutputFormatPlugin): ''' if self.opts.no_default_epub_cover: return None + self.log('Generating default cover') try: from calibre.gui2 import images_rc, is_ok_to_use_qt # Needed for access to logo from PyQt4.Qt import QFile, QIODevice diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index a00431460e..e09a54501c 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -538,7 +538,7 @@ class Application(QApplication): def is_ok_to_use_qt(): global gui_thread - if islinux and ':' in os.environ.get('DISPLAY', ''): + if islinux and ':' not in os.environ.get('DISPLAY', ''): return False if QApplication.instance() is None: QApplication([])