xgps works with new protocol.

1 files changed, 1 insertions, 11 deletions

diff --git a/xgps.c b/xgps.c
index 5ec31595..98fa704e 100644
--- a/xgps.c
+++ b/xgps.c
@@ -875,11 +875,9 @@ update_panel(struct gps_data_t *gpsdata, char *message,
 	XmString string[MAXCHANNELS + 1];
 	char s[128], *latlon, *sp;
 
-#ifdef GPSDNG_ENABLE
 	/* this is where we implement source-device filtering */
-	if (gpsdata->dev.path[0] && source.device[0] && strcmp(source.device, gpsdata->dev.path) != 0)
+	if (gpsdata->dev.path[0] && source.device!=NULL && strcmp(source.device, gpsdata->dev.path) != 0)
 	    return;
-#endif /* GPSDNG_ENABLE */
 
 	/* the raw data sisplay */
 	if (message[0] != '\0')
@@ -1082,18 +1080,10 @@ handle_gps(XtPointer client_data UNUSED, XtIntervalId *ignored UNUSED)
 
 		gps_set_raw_hook(gpsdata, update_panel);
 
-#ifdef OLDSTYLE_ENABLE
-		if (jitteropt)
-		    (void)gps_query(gpsdata, "J=1");
-		if (source.device != NULL)
-		    (void)gps_query(gpsdata, "F=%s", source.device);
-		(void)gps_query(gpsdata, "w+x");
-#else
 		if (jitteropt)
 		    (void)gps_query(gpsdata, "?WATCH={\"buffer_policy\":1};");
 		else
 		    (void)gps_query(gpsdata, "?WATCH={\"buffer_policy\":0};");
-#endif /* OLDSTYLE */
 
 		gps_input = XtAppAddInput(app, gpsdata->gps_fd,
 		    (XtPointer)XtInputReadMask, handle_input, NULL);