openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/macfix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

-- 
https://code.launchpad.net/~raoul-snyman/openlp/macfix/+merge/21270
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2010-03-05 23:03:00 +0000
+++ openlp.pyw	2010-03-12 18:36:26 +0000
@@ -34,7 +34,6 @@
 
 log = logging.getLogger()
 
-import openlp
 from openlp.core.lib import Receiver, str_to_bool
 from openlp.core.resources import qInitResources
 from openlp.core.ui import MainWindow, SplashScreen, ScreenList

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2010-03-09 19:58:59 +0000
+++ openlp/core/utils/__init__.py	2010-03-12 18:36:26 +0000
@@ -45,9 +45,9 @@
         if dir_type == AppLocation.AppDir:
            return os.path.abspath(os.path.split(sys.argv[0])[0])
         elif dir_type == AppLocation.ConfigDir:
-            if os.name == u'nt':
+            if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
-            elif os.name == u'mac':
+            elif sys.platform == u'darwin':
                 path = os.path.join(os.getenv(u'HOME'), u'Library',
                     u'Application Support', u'openlp')
             else:
@@ -58,9 +58,9 @@
                     path = os.path.join(os.getenv(u'HOME'), u'.openlp')
             return path
         elif dir_type == AppLocation.DataDir:
-            if os.name == u'nt':
+            if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
-            elif os.name == u'mac':
+            elif sys.platform == u'darwin':
                 path = os.path.join(os.getenv(u'HOME'), u'Library',
                     u'Application Support', u'openlp', u'Data')
             else:
@@ -100,4 +100,4 @@
 from registry import Registry
 from confighelper import ConfigHelper
 
-__all__ = [u'Registry', u'ConfigHelper', u'AppLocations', u'check_latest_version']
+__all__ = [u'Registry', u'ConfigHelper', u'AppLocation', u'check_latest_version']