[POS-commit] r3987 - in stoq/trunk/stoq: .

[Johan Dahlin]

Author: jdahlin
Date: Wed Jul 26 13:08:19 2006
New Revision: 3987

Modified:
   stoq/trunk/stoq/lib/stoqconfig.py
   stoq/trunk/stoq/main.py

Log:
Move register_iconsets() out of AppConfig

Modified: stoq/trunk/stoq/lib/stoqconfig.py
==============================================================================
--- stoq/trunk/stoq/lib/stoqconfig.py	(original)
+++ stoq/trunk/stoq/lib/stoqconfig.py	Wed Jul 26 13:08:19 2006
@@ -36,7 +36,6 @@
 from kiwi.environ import environ
 from stoqlib.exceptions import (DatabaseError, UserProfileError,
                                 LoginError, DatabaseInconsistency)
-from stoqlib.gui.base.gtkadds import register_iconsets
 from stoqlib.lib.runtime import set_current_user, get_connection
 from stoqlib.domain.person import PersonAdaptToUser
 from stoqlib.domain.tables import get_table_types
@@ -134,9 +133,6 @@
         if fd != -1:
             sys.stderr = Output(sys.stderr, fd)
 
-        # Registering some new important stock icons
-        register_iconsets()
-
         conn = get_connection()
         if not self.validate_user():
             LoginError('Could not authenticate in the system')

Modified: stoq/trunk/stoq/main.py
==============================================================================
--- stoq/trunk/stoq/main.py	(original)
+++ stoq/trunk/stoq/main.py	Wed Jul 26 13:08:19 2006
@@ -100,8 +100,14 @@
 
 def _run_app(options, appname):
     from stoq.lib.stoqconfig import AppConfig, show_splash
+    from stoqlib.gui.base.gtkadds import register_iconsets
+
     log.info('displaying splash screen')
     show_splash()
+
+    log.info('register stock icons')
+    register_iconsets()
+
     log.info('loading application')
     appconf = AppConfig()
     appname = appconf.setup_app(appname, splash=True)