[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 1b882a8b5f87c4df73f77d62f7fbfa2547cbb1bd
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Sat Jan 10 12:10:47 2009 +0100

    ogpsd: use framework.config like ogsmd.device

diff --git a/framework/subsystems/ogpsd/factory.py b/framework/subsystems/ogpsd/factory.py
index 73bc834..8762410 100644
--- a/framework/subsystems/ogpsd/factory.py
+++ b/framework/subsystems/ogpsd/factory.py
@@ -13,6 +13,8 @@ GPLv2 or later
 __version__ = "0.0.0"
 
 import dbus
+
+from framework.config import config
 from gpsdevice import DummyDevice
 from nmea import NMEADevice
 from ubx import UBXDevice
@@ -28,9 +30,9 @@ def factory( prefix, controller ):
 
     objects = []
 
-    devname = controller.config.getValue( "ogpsd", "device", "DummyDevice")
-    channame = controller.config.getValue( "ogpsd", "channel", "GPSChannel")
-    pathname = controller.config.getValue( "ogpsd", "path", "")
+    devname = config.getValue( "ogpsd", "device", "DummyDevice")
+    channame = config.getValue( "ogpsd", "channel", "GPSChannel")
+    pathname = config.getValue( "ogpsd", "path", "")
 
     channel = globals()[channame]( pathname )
     gpsdev = globals()[devname]( controller.bus, channel )

-- 
FSO frameworkd Debian packaging