[gdm/wip/slave-connection: 20/38] daemon: Port GdmLocalDisplayFactory to GDBus

[Ray Strode <halfline src gnome org>]

commit fbdbcb6f908527fed1f5acda17069345893c0ed6
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                 |   16 +++++++++++-----
 daemon/gdm-local-display-factory.c |    2 --
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0d8d41..d7c7abb 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 6116ebe..6715f66 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -56,8 +56,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
 
 noinst_PROGRAMS = 		\
 	test-session		\
@@ -267,9 +272,10 @@ sbin_SCRIPTS =		\
 gdm: $(srcdir)/gdm.in
 	sed -e 's,[ ]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm
 
-CLEANFILES =			\
-	gdm			\
-	$(BUILT_SOURCES)	\
+CLEANFILES =					\
+	gdm					\
+	gdm-local-display-factory-glue.c	\
+	$(BUILT_SOURCES)			\
 	$(NULL)
 
 EXTRA_DIST = 				\
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 9cdf198..2030651 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -641,8 +641,6 @@ gdm_local_display_factory_class_init (GdmLocalDisplayFactoryClass *klass)
         factory_class->stop = gdm_local_display_factory_stop;
 
         g_type_class_add_private (klass, sizeof (GdmLocalDisplayFactoryPrivate));
-
-        dbus_g_object_type_install_info (GDM_TYPE_LOCAL_DISPLAY_FACTORY, &dbus_glib_gdm_local_display_factory_object_info);
 }
 
 static void