Do not exit at the beginning if Epub support cannot be enabled

2 files changed, 13 insertions, 2 deletions

diff --git a/readactivity.py b/readactivity.py
index 4e8bd31..42b4772 100644
--- a/readactivity.py
+++ b/readactivity.py
@@ -37,7 +37,13 @@ from sugar.graphics.objectchooser import ObjectChooser
 from readtoolbar import EditToolbar, ReadToolbar, ViewToolbar
 from readsidebar import Sidebar
 from readtopbar import TopBar
-import epubadapter
+
+
+_EPUB_SUPPORT = True
+try:
+    import epubadapter
+except:
+    _EPUB_SUPPORT = False
 
 
 _HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
@@ -487,6 +493,8 @@ class ReadActivity(activity.Activity):
         """
         mimetype = mime.get_for_file(filepath)
         if mimetype == 'application/epub+zip':
+            if not _EPUB_SUPPORT:
+                self.close()
             self._epub = True
             self._setup_epub_viewer()
             self._document = epubadapter.EpubDocument(self._view, filepath.replace('file://', ''))
diff --git a/readtoolbar.py b/readtoolbar.py
index 9af7ac4..ba48a24 100644
--- a/readtoolbar.py
+++ b/readtoolbar.py
@@ -23,7 +23,10 @@ import gobject
 import gtk
 import evince
 
-import epubadapter
+try:
+    import epubadapter
+except:
+    pass
 
 import md5