Set type when calling gps_new

diff --git a/src/mapper.c b/src/mapper.c
index ae3599dae05b1647954b5b1c663a524434e321c6..759467f98c2eff9f1d9c1ad9d7191a65e30e0a23 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -201,15 +201,16 @@ switch (mis) {
        case MAPPER_INIT_START:
                curl_global_init(CURL_GLOBAL_NOTHING);
                gnome_vfs_init();
-               _gps=gps_new();
-               _gps->io.type=GPS_IO_SIMULATION;
+               /* XXX: Load GPS configuration, then create gps */
 #ifdef WITH_BLUEZ
-               _gps->io.type=GPS_IO_RFCOMM;
-#endif
+               _gps=gps_new(GPS_IO_RFCOMM);
+#else
 #ifdef WITH_HILDON_DBUS_BT
-               _gps->io.type=GPS_IO_HILDON_DBUS;
+               _gps=gps_new(GPS_IO_RFCOMM);
+#else
+               _gps=gps_new(GPS_IO_SIMULATION);
+#endif
 #endif
-               _gps->io.conn = RCVR_OFF;
                timezone_init();
                gpx_init();
                variables_init();