Some fixes

diff --git a/src/gps.c b/src/gps.c
index 191007ea77411dbdccd0f2dedcdb138728287173..892b3a64f757229dfa85dd2db29ccb96e6557801 100644 (file)
--- a/src/gps.c
+++ b/src/gps.c
@@ -260,13 +260,14 @@ if (gps->io.type==GPS_IO_HILDON_DBUS && gps->io.rfcomm_req_proxy) {
                dbus_g_proxy_call(gps->io.rfcomm_req_proxy, BTCOND_RFCOMM_CANCEL_CONNECT_REQ, &error, G_TYPE_STRING, gps->io.address, G_TYPE_STRING, "SPP", G_TYPE_INVALID, G_TYPE_INVALID);
                error = NULL;
                dbus_g_proxy_call(gps->io.rfcomm_req_proxy,     BTCOND_RFCOMM_DISCONNECT_REQ, &error,G_TYPE_STRING, gps->io.address, G_TYPE_STRING, "SPP", G_TYPE_INVALID, G_TYPE_INVALID);
-       }
 }
 #endif
 
 #ifdef WITH_BLUEZ_DBUS_BT
 if (gps->io.type==GPS_IO_BLUEZ_DBUS && gps->io.rfcomm_req_proxy) {
-               GError *error = NULL;
+       GError *error = NULL;
+
+       
 }
 #endif
 
@@ -400,7 +401,7 @@ switch (gps->io.type) {
                /* Set gpsd to NMEA mode */
                if (gps->io.type==GPS_IO_GPSD) {
                        GIOStatus status;
-                       gint written;
+                       gsize written;
                        status=g_io_channel_write_chars(gps->io.channel, GPSD_NMEA, -1, &written, NULL);
                        if (status!=G_IO_STATUS_NORMAL || written!=sizeof(GPSD_NMEA)) {
                                g_printerr("Failed to set gpsd to NMEA mode\n");