summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--daemon/Makefile.am9
-rw-r--r--daemon/test-hal-seats.c2
3 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 476c2ec7..79c46d28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-11-07 William Jon McCann <mccann@jhu.edu>
+ * daemon/Makefile.am:
+ * daemon/test-hal-seats.c: (list_seats):
+ Build the test hal seats tool
+
+2007-11-07 William Jon McCann <mccann@jhu.edu>
+
* daemon/gdm-factory-slave.c: (greeter_reset_timeout),
(queue_greeter_reset), (on_session_setup_complete),
(on_session_setup_failed), (on_session_reset_complete),
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 166b3923..2e86a842 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -62,9 +62,18 @@ gdm-product-display-glue.h: gdm-product-display.xml Makefile.am
dbus-binding-tool --prefix=gdm_product_display --mode=glib-server --output=gdm-product-display-glue.h $(srcdir)/gdm-product-display.xml
noinst_PROGRAMS = \
+ test-hal-seats \
test-session \
$(NULL)
+test_hal_seats_SOURCES = \
+ test-hal-seats.c \
+ $(NULL)
+
+test_hal_seats_LDADD = \
+ $(DAEMON_LIBS) \
+ $(NULL)
+
test_session_SOURCES = \
test-session.c \
ck-connector.h \
diff --git a/daemon/test-hal-seats.c b/daemon/test-hal-seats.c
index 4d22276c..9b0c35ad 100644
--- a/daemon/test-hal-seats.c
+++ b/daemon/test-hal-seats.c
@@ -109,7 +109,7 @@ list_seats (GList *seats)
{
GList *l;
for (l = seats; l != NULL; l = l->next) {
- g_message ("Found device: %s", l->data);
+ g_message ("Found device: %s", (char *)l->data);
}
}