[gdm/wip/slave-connection: 12/32] daemon: Port GdmLocalDisplayFactory to GDBus

[Ray Strode <halfline src gnome org>]

commit 7d3db9f748444f89f744f0908ef7a61223991ccc
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Thu May 3 18:29:00 2012 +0200

    daemon: Port GdmLocalDisplayFactory to GDBus
    
    GdmLocalDisplayFactory is the object that manages
    starting and stopping displays (with login screens)
    based on information provided from logind (or a hard
    coded single display if systemd is unavailable).
    
    GdmLocalDisplayFactory also manages "transient" displays
    that are started as part of user switching.
    
    This commit moves GdmLocalDisplayFactory over to using
    GDBus instead of dbus-glib.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=622888

 .gitignore         |    1 +
 daemon/Makefile.am |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8692d11..a85ccae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ gdm.conf
 gdm.conf-custom
 gdm-display-glue.h
 gdm-local-display-factory-glue.h
+gdm-local-display-factory-glue.c
 gdm-manager-glue.h
 gdm.pot
 gdm-restart
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 68cbe90..f827b1b 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -60,8 +60,13 @@ gdm-static-display-glue.h: gdm-static-display.xml Makefile.am
 	dbus-binding-tool --prefix=gdm_static_display --mode=glib-server --output=gdm-static-display-glue.h $(srcdir)/gdm-static-display.xml
 gdm-transient-display-glue.h: gdm-transient-display.xml Makefile.am
 	dbus-binding-tool --prefix=gdm_transient_display --mode=glib-server --output=gdm-transient-display-glue.h $(srcdir)/gdm-transient-display.xml
-gdm-local-display-factory-glue.h: gdm-local-display-factory.xml Makefile.am
-	dbus-binding-tool --prefix=gdm_local_display_factory --mode=glib-server --output=gdm-local-display-factory-glue.h $(srcdir)/gdm-local-display-factory.xml
+
+gdm-local-display-factory-glue.c gdm-local-display-factory-glue.h : gdm-local-display-factory.xml Makefile.am
+	$(AM_V_GEN)gdbus-codegen 					\
+		--c-namespace=GdmDBus					\
+		--interface-prefix=org.gnome.DisplayManager		\
+		--generate-c-code=gdm-local-display-factory-glue	\
+		$(srcdir)/gdm-local-display-factory.xml
 
 gdm-greeter-glue.c gdm-greeter-glue.h : gdm-greeter-server.xml Makefile.am
 	$(AM_V_GEN)gdbus-codegen 					\
@@ -287,10 +292,11 @@ sbin_SCRIPTS =		\
 gdm: $(srcdir)/gdm.in
 	sed -e 's,[ ]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm
 
-CLEANFILES =			\
-	gdm			\
-	gdm-greeter-glue.c	\
-	$(BUILT_SOURCES)	\
+CLEANFILES =					\
+	gdm					\
+	gdm-greeter-glue.c			\
+	gdm-local-display-factory-glue.c	\
+	$(BUILT_SOURCES)			\
 	$(NULL)
 
 EXTRA_DIST = 				\