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

IGN:Fix typo that was preventing EPUB Output from working in absence of X server

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-14 10:27:47 -06:00
parent 831ce503f4
commit 5e98eb1d29
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/epub/output.py
View File

@ -161,10 +161,8 @@ class EPUBOutput(OutputFormatPlugin):
) )
split(self.oeb, self.opts) split(self.oeb, self.opts)
self.workaround_ade_quirks() self.workaround_ade_quirks()
self.workaround_webkit_quirks() self.workaround_webkit_quirks()
from calibre.ebooks.oeb.transforms.rescale import RescaleImages from calibre.ebooks.oeb.transforms.rescale import RescaleImages
RescaleImages()(oeb, opts) RescaleImages()(oeb, opts)
self.insert_cover() self.insert_cover()
@ -194,6 +192,7 @@ class EPUBOutput(OutputFormatPlugin):
''' '''
if self.opts.no_default_epub_cover: if self.opts.no_default_epub_cover:
return None return None
self.log('Generating default cover')
try: try:
from calibre.gui2 import images_rc, is_ok_to_use_qt # Needed for access to logo from calibre.gui2 import images_rc, is_ok_to_use_qt # Needed for access to logo
from PyQt4.Qt import QFile, QIODevice from PyQt4.Qt import QFile, QIODevice

2
src/calibre/gui2/__init__.py
View File

@ -538,7 +538,7 @@ class Application(QApplication):
def is_ok_to_use_qt(): def is_ok_to_use_qt():
global gui_thread global gui_thread
if islinux and ':' in os.environ.get('DISPLAY', ''): if islinux and ':' not in os.environ.get('DISPLAY', ''):
return False return False
if QApplication.instance() is None: if QApplication.instance() is None:
QApplication([]) QApplication([])