From: Kaj-Michael Lang <milang@tal.org>
Date: Mon, 4 Feb 2008 08:05:00 +0000 (+0200)
Subject: Fix build under hildon
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1f3a00b9b1526adf73fd2700afb0285b7f5d6cf;p=mapper

Fix build under hildon
---

diff --git a/src/Makefile.am b/src/Makefile.am
index c129230..a88b1a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,12 +88,15 @@ if HAVE_BLUEZ_DBUS_BT
 libmappergps_la_SOURCES+=gps-bluetooth-bluez.c gps-bluetooth-bluez-marshal.c
 endif
 
+libmappergps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines) 
+libmappergps_la_LIBADD = $(GLIBGTK_LIBS)
+libmappergps_la_LDFLAGS = -lm -no-undefined
+
 if HAVE_HILDON_DBUS_BT
 libmappergps_la_SOURCES+=gps-bluetooth-maemo.c gps-bluetooth-maemo-marshal.c 
+libmappergps_la_CFLAGS+= $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) $(LIBGPSBT_CFLAGS)
+libmappergps_la_LIBADD+= $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(LIBGPSBT_LIBS)
 endif
-libmappergps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(LIBGPSBT_CFLAGS) $(defines) 
-libmappergps_la_LIBADD = $(GLIBGTK_LIBS) $(LIBGPSBT_LIBS)
-libmappergps_la_LDFLAGS = -lm -no-undefined
 
 libgtkgps_la_SOURCES = gtkgps.c gtkcompass.c
 libgtkgps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines)
diff --git a/src/gps.c b/src/gps.c
index 629d529..5d2ce27 100644
--- a/src/gps.c
+++ b/src/gps.c
@@ -193,12 +193,12 @@ if (gps->io.conn==RCVR_DOWN && gps->io.address) {
 		} else {
 			/* Unknown error. */
 			g_printerr("Error: %s\n", error->message);
-			gps_disconnect(_gps);
-			gps_connect_later(_gps);	/* Try again later. */
+			gps_disconnect(gps);
+			gps_connect_later(gps);	/* Try again later. */
 			return;
 		}
 	}
-	gps_connect_fd(fdpath);
+	gps_connect_file(gps, fdpath);
 }
 /* else { Looks like the middle of a disconnect.  Do nothing. } */
 }