From 5af2dbcbb808032919f969a2f76f1c5758404c03 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Mon, 29 Sep 2008 16:05:34 +0000
Subject: Fix controlpanel dynamic imports

---
(limited to 'src/jarabe/controlpanel')

diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 98524cd..3906be1 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -195,11 +195,11 @@ class ControlPanel(gtk.Window):
 
         self._current_option = option
 
-        mod = __import__('.'.join(('controlpanel', option, 'view')), 
+        mod = __import__('.'.join(('jarabe.controlpanel', option, 'view')), 
                          globals(), locals(), ['view']) 
         view_class = getattr(mod, self._options[option]['view'], None)
 
-        mod = __import__('.'.join(('controlpanel', option, 'model')), 
+        mod = __import__('.'.join(('jarabe.controlpanel', option, 'model')), 
                          globals(), locals(), ['model'])
         model = ModelWrapper(mod)        
 
@@ -225,13 +225,13 @@ class ControlPanel(gtk.Window):
         '''
         options = {}
 
-        path = os.path.join(config.shell_path, 'controlpanel')
+        path = os.path.dirname(__file__)
         folder = os.listdir(path)
 
         for item in folder:
             if os.path.isdir(os.path.join(path, item)) and \
                     os.path.exists(os.path.join(path, item, '__init__.py')):
-                mod = __import__('.'.join(('controlpanel', item)), 
+                mod = __import__('.'.join(('jarabe.controlpanel', item)), 
                                  globals(), locals(), [item])
                 view_class = getattr(mod, 'CLASS', None)
                 if view_class is not None: 
--
cgit v0.9.1