[gdm/wip/slave-connection: 9/37] daemon: Don't put simple slave interface on bus



commit dca94961a75a1a6e68c111a9b854a5142843eb9e
Author: Ray Strode <rstrode redhat com>
Date:   Thu Jul 12 14:41:53 2012 -0400

    daemon: Don't put simple slave interface on bus
    
    It doesn't do anything.

 daemon/Makefile.am          |    3 ---
 daemon/gdm-simple-slave.c   |    6 ------
 daemon/gdm-simple-slave.xml |    5 -----
 3 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index f7b9812..7bb68f2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -30,7 +30,6 @@ AM_CPPFLAGS = \
 
 BUILT_SOURCES =					\
 	gdm-slave-glue.h			\
-	gdm-simple-slave-glue.h			\
 	gdm-xdmcp-chooser-slave-glue.h		\
 	gdm-manager-glue.h			\
 	gdm-display-glue.h			\
@@ -45,8 +44,6 @@ gdm-manager-glue.h: gdm-manager.xml Makefile.am
 	dbus-binding-tool --prefix=gdm_manager --mode=glib-server --output=gdm-manager-glue.h $(srcdir)/gdm-manager.xml
 gdm-slave-glue.h: gdm-slave.xml Makefile.am
 	dbus-binding-tool --prefix=gdm_slave --mode=glib-server --output=gdm-slave-glue.h $(srcdir)/gdm-slave.xml
-gdm-simple-slave-glue.h: gdm-simple-slave.xml Makefile.am
-	dbus-binding-tool --prefix=gdm_simple_slave --mode=glib-server --output=gdm-simple-slave-glue.h $(srcdir)/gdm-simple-slave.xml
 gdm-xdmcp-chooser-slave-glue.h: gdm-xdmcp-chooser-slave.xml Makefile.am
 	dbus-binding-tool --prefix=gdm_xdmcp_chooser_slave --mode=glib-server --output=gdm-xdmcp-chooser-slave-glue.h $(srcdir)/gdm-xdmcp-chooser-slave.xml
 gdm-display-glue.h: gdm-display.xml Makefile.am
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index e218c66..4dea4d2 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -38,10 +38,6 @@
 #include <glib/gstdio.h>
 #include <glib-object.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include <X11/Xlib.h> /* for Display */
 
 #include "gdm-common.h"
@@ -1709,8 +1705,6 @@ gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass)
         slave_class->stop = gdm_simple_slave_stop;
 
         g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate));
-
-        dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]