#include "level2.h"
#include "../aweather-location.h"
-#include "compat.h"
+#include "../compat.h"
/* interval to update map with new gps data in seconds. */
#define GPS_UPDATE_INTERVAL (2)
gps_track_add_point(&gps->track,
gps_data->fix.latitude, gps_data->fix.longitude, 0.0);
- if (gps->track.line) {
- grits_viewer_remove(gps->viewer,
- GRITS_OBJECT(gps->track.line));
- gps->track.line = NULL;
- }
+ grits_object_destroy_pointer(&gps->track.line);
gps->track.line = grits_line_new(gps->track.points);
gps->track.line->color[0] = 1.0;
}
if (gps_data_is_valid(gps_data)) {
- if (gps->marker) {
- grits_viewer_remove(gps->viewer,
- GRITS_OBJECT(gps->marker));
- gps->marker = NULL;
- }
+ grits_object_destroy_pointer(&gps->marker);
gchar *path = find_path(GPS_MARKER_ICON_PATH, GPS_MARKER_ICON);
if (path) {
gtk_range_set_increments(
GTK_RANGE(gps->ui.gps_log_interval_slider),
10.0 /* step */, 30.0 /* page up/down */);
+#if ! GTK_CHECK_VERSION(3,0,0)
gtk_range_set_update_policy(
GTK_RANGE(gps->ui.gps_log_interval_slider),
GTK_UPDATE_DELAYED);
+#endif
gtk_box_pack_start(GTK_BOX(ubox), gps->ui.gps_log_interval_slider,
TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(lbox), ubox, FALSE, FALSE, 0);
if (gps->viewer) {
GritsViewer *viewer = gps->viewer;
gps->viewer = NULL;
- if (gps->marker)
- grits_viewer_remove(viewer,
- GRITS_OBJECT(gps->marker));
+ grits_object_destroy_pointer(&gps->marker);
g_object_unref(gps->prefs);
g_object_unref(viewer);
}