Jonathan Corwin has proposed merging lp:~j-corwin/openlp/presentations into
lp:openlp.
Requested reviews:
openlp.org Core (openlp-core)
Not entirely sure about the rules for __init__.py, but these changes get rid of
the linux errors.
--
https://code.launchpad.net/~j-corwin/openlp/presentations/+merge/12370
Your team openlp.org Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/presentations/lib/__init__.py'
--- openlp/plugins/presentations/lib/__init__.py 2009-09-23 22:39:37 +0000
+++ openlp/plugins/presentations/lib/__init__.py 2009-09-24 18:50:45 +0000
@@ -21,14 +21,18 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import os
from impresscontroller import ImpressController
-#from powerpointcontroller import PowerpointController
-from pptviewcontroller import PptviewController
+if os.name == u'nt':
+ #from powerpointcontroller import PowerpointController
+ from pptviewcontroller import PptviewController
from messagelistener import MessageListener
from mediaitem import PresentationMediaItem
from presentationtab import PresentationTab
-
__all__ = ['PresentationMediaItem', 'PresentationTab',
- 'ImpressController', 'ImpressController', 'PowerpointController', 'MessageListener']
+ 'ImpressController', 'MessageListener']
+if os.name == u'nt':
+ __all__.append('PptviewController')
+ #__all__.append('PowerpointController');
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
