[gdm/wip/shell-greeter] squash with library commit

[Ray Strode <halfline src gnome org>]

commit 6f7036b20d0ec5936b5fce37553da0b0671439fc
Author: Ray Strode <rstrode redhat com>
Date:   Thu Jul 21 14:38:45 2011 -0400

    squash with library commit

 gui/libgdmgreeter/Makefile.am          |    4 ++++
 gui/libgdmgreeter/gdm-greeter-client.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gui/libgdmgreeter/Makefile.am b/gui/libgdmgreeter/Makefile.am
index 73be68f..f1e2a51 100644
--- a/gui/libgdmgreeter/Makefile.am
+++ b/gui/libgdmgreeter/Makefile.am
@@ -7,6 +7,8 @@ AM_CPPFLAGS = \
         -I.                                                                   \
         -I..                                                                  \
         -DG_LOG_DOMAIN=\"GdmGreeter\"                                         \
+        -DDMCONFDIR=\""$(dmconfdir)"\"                                        \
+        -DDATADIR=\""$(datadir)"\"                                            \
         $(END_OF_LIST)
 
 lib_LTLIBRARIES =                                                             \
@@ -16,6 +18,7 @@ lib_LTLIBRARIES =                                                             \
 libgdmgreeterdir = $(includedir)/gdm/greeter
 libgdmgreeter_HEADERS =                                                       \
         gdm-greeter-client.h                                                  \
+        gdm-greeter-sessions.h                                                \
         $(END_OF_LIST)
 
 libgdmgreeter_la_CFLAGS =                                                     \
@@ -34,6 +37,7 @@ libgdmgreeter_la_LIBADD =                                                     \
 libgdmgreeter_la_SOURCES =                                                    \
         $(libgdmgreeter_HEADERS)                                              \
         gdm-greeter-client.c                                                  \
+        gdm-greeter-sessions.c                                                \
         $(END_OF_LIST)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/gui/libgdmgreeter/gdm-greeter-client.c b/gui/libgdmgreeter/gdm-greeter-client.c
index 9438b7f..a02f735 100644
--- a/gui/libgdmgreeter/gdm-greeter-client.c
+++ b/gui/libgdmgreeter/gdm-greeter-client.c
@@ -99,7 +99,7 @@ gdm_greeter_client_error_quark (void)
 }
 
 /**
- * gdm_greeter_get_display_is_local:
+ * gdm_greeter_client_get_display_is_local:
  *
  * @client: a #GdmGreeterClient
  *