diff options
| author | Richard Hughes <richard@hughsie.com> | 2010-11-01 11:28:31 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2010-11-01 11:28:31 +0000 |
| commit | 59893663fbc0b9b5951b69b99a849d4ae5a2f3fd (patch) | |
| tree | 095c1acca94e25920a64635b849d4de654c1d984 /tools | |
| parent | ed34986e08fc45e5337c3edae181c3caa23c99d2 (diff) | |
| download | upower-59893663fbc0b9b5951b69b99a849d4ae5a2f3fd.tar.gz | |
Port from EggDebug to the GLib built-in logging framework
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 3 | ||||
| l--------- | tools/egg-debug.c | 1 | ||||
| l--------- | tools/egg-debug.h | 1 | ||||
| -rw-r--r-- | tools/up-tool.c | 7 |
4 files changed, 3 insertions, 9 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index d477e57..55a0f06 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -DUP_COMPILATION \ + -DG_LOG_DOMAIN=\"UPower\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libupower-glib \ $(DBUS_GLIB_CFLAGS) \ @@ -13,8 +14,6 @@ UPOWER_LIBS = $(top_builddir)/libupower-glib/libupower-glib.la bin_PROGRAMS = upower upower_SOURCES = \ - egg-debug.c \ - egg-debug.h \ up-tool.c \ $(BUILT_SOURCES) diff --git a/tools/egg-debug.c b/tools/egg-debug.c deleted file mode 120000 index 0a3eb62..0000000 --- a/tools/egg-debug.c +++ /dev/null @@ -1 +0,0 @@ -../src/egg-debug.c
\ No newline at end of file diff --git a/tools/egg-debug.h b/tools/egg-debug.h deleted file mode 120000 index db811d2..0000000 --- a/tools/egg-debug.h +++ /dev/null @@ -1 +0,0 @@ -../src/egg-debug.h
\ No newline at end of file diff --git a/tools/up-tool.c b/tools/up-tool.c index d698c7c..9be5588 100644 --- a/tools/up-tool.c +++ b/tools/up-tool.c @@ -35,8 +35,6 @@ #include "up-device.h" #include "up-wakeups.h" -#include "egg-debug.h" - static GMainLoop *loop; static gboolean opt_monitor_detail = FALSE; @@ -275,7 +273,6 @@ main (int argc, char **argv) context = g_option_context_new ("UPower tool"); g_option_context_add_main_entries (context, entries, NULL); - g_option_context_add_group (context, egg_debug_get_option_group ()); g_option_context_parse (context, &argc, &argv, NULL); g_option_context_free (context); @@ -306,7 +303,7 @@ main (int argc, char **argv) GPtrArray *devices; ret = up_client_enumerate_devices_sync (client, NULL, &error); if (!ret) { - egg_warning ("failed to enumerate: %s", error->message); + g_warning ("failed to enumerate: %s", error->message); goto out; } devices = up_client_get_devices (client); @@ -333,7 +330,7 @@ main (int argc, char **argv) if (opt_monitor || opt_monitor_detail) { ret = up_client_enumerate_devices_sync (client, NULL, &error); if (!ret) { - egg_warning ("failed to enumerate: %s", error->message); + g_warning ("failed to enumerate: %s", error->message); goto out; } if (!up_tool_do_monitor (client)) |