1 files changed, 9 insertions, 9 deletions

diff --git a/src/location-geoclue2.c b/src/location-geoclue2.c
index 835b4c4..329348e 100644
--- a/src/location-geoclue2.c
+++ b/src/location-geoclue2.c
@@ -34,8 +34,7 @@ struct location_state {
 	int pipe_fd_write;
 	int available;
 	int error;
-	float latitude;
-	float longitude;
+	struct location location;
 };
 
 
@@ -104,11 +103,11 @@ geoclue_client_signal_cb(GDBusProxy *client, gchar *sender_name,
 	/* Read location properties */
 	GVariant *lat_v = g_dbus_proxy_get_cached_property(
 		location, "Latitude");
-	state->latitude = g_variant_get_double(lat_v);
+	state->location.lat = g_variant_get_double(lat_v);
 
 	GVariant *lon_v = g_dbus_proxy_get_cached_property(
 		location, "Longitude");
-	state->longitude = g_variant_get_double(lon_v);
+	state->location.lon = g_variant_get_double(lon_v);
 
 	state->available = 1;
 
@@ -344,8 +343,8 @@ location_geoclue2_start(struct location_state *state)
 
 	state->available = 0;
 	state->error = 0;
-	state->latitude = 0;
-	state->longitude = 0;
+	state->location.lat = 0;
+	state->location.lon = 0;
 
 	int pipefds[2];
 	int r = pipeutils_create_nonblocking(pipefds);
@@ -408,13 +407,14 @@ location_geoclue2_handle(
 	struct location_state *state,
 	struct location *location, int *available)
 {
+	int error;
+
 	pipeutils_handle_signal(state->pipe_fd_read);
 
 	g_mutex_lock(&state->lock);
 
-	int error = state->error;
-	location->lat = state->latitude;
-	location->lon = state->longitude;
+	error = state->error;
+	*location = state->location;
 	*available = state->available;
 
 	g_mutex_unlock(&state->lock);