Port from EggDebug to the GLib built-in logging framework

5 files changed, 17 insertions, 24 deletions

diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am
index 2bf50f5..5da5ce9 100644
--- a/src/freebsd/Makefile.am
+++ b/src/freebsd/Makefile.am
@@ -3,6 +3,7 @@
 INCLUDES = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
 	-DUP_COMPILATION					\
+	-DG_LOG_DOMAIN=\"UPower-Freebsd\"			\
 	-I$(top_srcdir)/libupower-glib				\
 	$(DBUS_GLIB_CFLAGS)					\
 	$(POLKIT_CFLAGS)					\
diff --git a/src/freebsd/up-backend.c b/src/freebsd/up-backend.c
index 01465e2..e1dd22a 100644
--- a/src/freebsd/up-backend.c
+++ b/src/freebsd/up-backend.c
@@ -38,8 +38,6 @@
 #include "up-device-supply.h"
 #include "up-util.h"
 
-#include "egg-debug.h"
-
 #include "up-backend.h"
 #include "up-daemon.h"
 #include "up-marshal.h"
@@ -151,7 +149,7 @@ up_backend_acpi_devd_notify (UpBackend *backend, const gchar *system, const gcha
 		g_object_get (backend->priv->daemon,
 			      "lid-is-present", &is_present, NULL);
 		if (!is_present) {
-			egg_warning ("received lid event without a configured lid; cold-plugging one");
+			g_warning ("received lid event without a configured lid; cold-plugging one");
 			up_backend_lid_coldplug (backend);
 			/* FALLTHROUGH */
 		}
@@ -165,7 +163,7 @@ up_backend_acpi_devd_notify (UpBackend *backend, const gchar *system, const gcha
 		goto out;
 
 	if (object == NULL) {
-		egg_warning ("did not find existing %s device; cold-plugging a new one", subsystem);
+		g_warning ("did not find existing %s device; cold-plugging a new one", subsystem);
 		up_backend_create_new_device (backend, native);
 		goto out;
 	}
@@ -266,7 +264,7 @@ up_backend_coldplug (UpBackend *backend, UpDaemon *daemon)
 			object = up_device_list_lookup (backend->priv->device_list, G_OBJECT (native));
 			if (object != NULL) {
 				device = UP_DEVICE (object);
-				egg_warning ("treating add event as change event on %s", up_device_get_object_path (device));
+				g_warning ("treating add event as change event on %s", up_device_get_object_path (device));
 				up_device_refresh_internal (device);
 			} else {
 				up_backend_create_new_device (backend, native);
@@ -365,7 +363,7 @@ up_backend_get_used_swap (UpBackend *backend)
 
 	kd = kvm_openfiles (NULL, NULL, NULL, O_RDONLY, errbuf);
 	if (kd == NULL) {
-		egg_warning ("failed to open kvm: '%s'", errbuf);
+		g_warning ("failed to open kvm: '%s'", errbuf);
 		return 0.0f;
 	}
 
@@ -375,7 +373,7 @@ up_backend_get_used_swap (UpBackend *backend)
 		goto out;
 	}
 	if (nswdev < 0) {
-		egg_warning ("failed to get swap info: '%s'", kvm_geterr (kd));
+		g_warning ("failed to get swap info: '%s'", kvm_geterr (kd));
 		percent = 0.0f;
 		goto out;
 	}
diff --git a/src/freebsd/up-devd.c b/src/freebsd/up-devd.c
index 7aa030a..2c76c04 100644
--- a/src/freebsd/up-devd.c
+++ b/src/freebsd/up-devd.c
@@ -30,8 +30,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "egg-debug.h"
-
 #include "up-backend.h"
 #include "up-backend-acpi.h"
 #include "up-devd.h"
@@ -148,7 +146,7 @@ up_devd_process_event (const gchar *event, gpointer user_data)
 
 	backend = UP_BACKEND(user_data);
 
-	egg_debug("received devd event: '%s'", event);
+	g_debug("received devd event: '%s'", event);
 
 	switch (event[0]) {
 	case UP_DEVD_EVENT_ADD:
@@ -180,7 +178,7 @@ up_devd_process_event (const gchar *event, gpointer user_data)
 	}
 
 malformed:
-	egg_warning("malformed devd event: %s", event);
+	g_warning("malformed devd event: %s", event);
 }
 
 static gboolean
@@ -221,7 +219,7 @@ up_devd_init (UpBackend *backend)
 
 	event_fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (event_fd < 0) {
-		egg_warning("failed to create event socket: '%s'", g_strerror(errno));
+		g_warning("failed to create event socket: '%s'", g_strerror(errno));
 		up_devd_inited = FALSE;
 		return;
 	}
@@ -236,7 +234,7 @@ up_devd_init (UpBackend *backend)
 		g_io_channel_unref (channel);
 		up_devd_inited = TRUE;
 	} else {
-		egg_warning ("failed to connect to %s: '%s'", UP_DEVD_SOCK_PATH,
+		g_warning ("failed to connect to %s: '%s'", UP_DEVD_SOCK_PATH,
 			     g_strerror(errno));
 		close (event_fd);
 		up_devd_inited = FALSE;
diff --git a/src/freebsd/up-device-supply.c b/src/freebsd/up-device-supply.c
index b499d57..d318bd6 100644
--- a/src/freebsd/up-device-supply.c
+++ b/src/freebsd/up-device-supply.c
@@ -40,8 +40,6 @@
 #include "up-acpi-native.h"
 #include "up-util.h"
 
-#include "egg-debug.h"
-
 #include "up-types.h"
 #include "up-device-supply.h"
 
@@ -175,22 +173,22 @@ up_device_supply_battery_set_properties (UpDevice *device, UpAcpiNative *native)
 		up_acpi_native_get_unit (native);
 	fd = open (UP_ACPIDEV, O_RDONLY);
 	if (fd < 0) {
-		egg_warning ("unable to open %s: '%s'", UP_ACPIDEV, g_strerror (errno));
+		g_warning ("unable to open %s: '%s'", UP_ACPIDEV, g_strerror (errno));
 		return FALSE;
 	}
 
 	if (ioctl (fd, ACPIIO_BATT_GET_BIF, &battif) == -1) {
-		egg_warning ("ioctl ACPIIO_BATT_GET_BIF failed for battery %d: '%s'", battif.unit, g_strerror (errno));
+		g_warning ("ioctl ACPIIO_BATT_GET_BIF failed for battery %d: '%s'", battif.unit, g_strerror (errno));
 		goto end;
 	}
 
 	if (ioctl (fd, ACPIIO_BATT_GET_BST, &battst) == -1) {
-		egg_warning ("ioctl ACPIIO_BATT_GET_BST failed for battery %d: '%s'", battst.unit, g_strerror (errno));
+		g_warning ("ioctl ACPIIO_BATT_GET_BST failed for battery %d: '%s'", battst.unit, g_strerror (errno));
 		goto end;
 	}
 
 	if (ioctl (fd, ACPIIO_BATT_GET_BATTINFO, &battinfo) == -1) {
-		egg_warning ("ioctl ACPIIO_BATT_GET_BATTINFO failed for battery %d: '%s'", battinfo.unit, g_strerror (errno));
+		g_warning ("ioctl ACPIIO_BATT_GET_BATTINFO failed for battery %d: '%s'", battinfo.unit, g_strerror (errno));
 		goto end;
 	}
 
@@ -356,7 +354,7 @@ up_device_supply_coldplug (UpDevice *device)
 	native_path = up_acpi_native_get_path (native);
 	driver = up_acpi_native_get_driver (native);
 	if (native_path == NULL) {
-		egg_warning ("could not get native path for %p", device);
+		g_warning ("could not get native path for %p", device);
 		goto out;
 	}
 
@@ -370,7 +368,7 @@ up_device_supply_coldplug (UpDevice *device)
 		goto out;
 	}
 
-	egg_warning ("invalid device %s with driver %s", native_path, driver);
+	g_warning ("invalid device %s with driver %s", native_path, driver);
 
 out:
 	return ret;
diff --git a/src/freebsd/up-util.c b/src/freebsd/up-util.c
index 6e75407..68ac900 100644
--- a/src/freebsd/up-util.c
+++ b/src/freebsd/up-util.c
@@ -29,8 +29,6 @@
 #include <sys/sysctl.h>
 #include <glib.h>
 
-#include "egg-debug.h"
-
 #include "up-util.h"
 
 gboolean
@@ -133,7 +131,7 @@ up_make_safe_string (const gchar *text)
 				ret[idx] = ret[i];
 			idx++;
 		} else {
-			egg_debug ("invalid char '%c'", ret[i]);
+			g_debug ("invalid char '%c'", ret[i]);
 		}
 	}