Major refactoring and some fixes

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 10 insertions, 11 deletions

diff --git a/src/location-geoclue2.c b/src/location-geoclue2.c
index 1fcfa51..b6238df 100644
--- a/src/location-geoclue2.c
+++ b/src/location-geoclue2.c
@@ -1,5 +1,7 @@
-/* location-geoclue2.c -- GeoClue2 location provider source
- * This file is part of redshift-ng.
+/* redshift-ng - Automatically adjust display colour temperature according the Sun
+ * 
+ * Copyright (c) 2009-2018        Jon Lund Steffensen <jonlst@gmail.com>
+ * Copyright (c) 2014-2016, 2025  Mattias Andrée <m@maandree.se>
  * 
  * redshift-ng is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,9 +15,6 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with redshift-ng.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Copyright (c) 2014-2017  Jon Lund Steffensen <jonlst@gmail.com>
- * Copyright (c) 2025       Mattias Andrée <m@maandree.se>
  */
 #include "common.h"
 
@@ -69,7 +68,7 @@ mark_error(struct location_state *state)
 	state->error = 1;
 	g_mutex_unlock(&state->lock);
 
-	pipeutils_signal(state->pipe_fd_write);
+	write(state->pipe_fd_write, "", 1);
 }
 
 /* Handle position change callbacks */
@@ -116,7 +115,7 @@ geoclue_client_signal_cb(GDBusProxy *client, gchar *sender_name, gchar *signal_n
 
 	g_mutex_unlock(&state->lock);
 
-	pipeutils_signal(state->pipe_fd_write);
+	write(state->pipe_fd_write, "", 1);
 }
 
 /* Callback when GeoClue name appears on the bus */
@@ -244,7 +243,7 @@ on_name_vanished(GDBusConnection *connection, const gchar *name, gpointer user_d
 	state->available = 0;
 	g_mutex_unlock(&state->lock);
 
-	pipeutils_signal(state->pipe_fd_write);
+	write(state->pipe_fd_write, "", 1);
 }
 
 /* Callback when the pipe to the main thread is closed. */
@@ -321,7 +320,7 @@ location_geoclue2_start(struct location_state *state)
 	state->location.latitude = 0;
 	state->location.longitude = 0;
 
-	if (pipeutils_create_nonblocking(pipefds)) {
+	if (pipe_nonblock(pipefds)) {
 		weprintf(_("Failed to start GeoClue2 provider!"));
 		return -1;
 	}
@@ -329,7 +328,7 @@ location_geoclue2_start(struct location_state *state)
 	state->pipe_fd_read = pipefds[0];
 	state->pipe_fd_write = pipefds[1];
 
-	pipeutils_signal(state->pipe_fd_write);
+	write(state->pipe_fd_write, "", 1);
 
 	g_mutex_init(&state->lock);
 	state->thread = g_thread_new("geoclue2", run_geoclue2_loop, state);
@@ -378,7 +377,7 @@ location_geoclue2_handle(struct location_state *state, struct location *location
 {
 	int error;
 
-	pipeutils_handle_signal(state->pipe_fd_read);
+	read(state->pipe_fd_read, &(char){0}, 1);
 
 	g_mutex_lock(&state->lock);
 	error = state->error;