Commit b29deda3 authored by Jasper St. Pierre's avatar Jasper St. Pierre

xdmcp-display: Remove dummy skeleton

This doesn't do anything, so why are we keeping it around?
parent df5bc252
......@@ -36,7 +36,6 @@ BUILT_SOURCES = \
gdm-slave-glue.h \
gdm-xdmcp-chooser-slave-glue.h \
gdm-display-glue.h \
gdm-xdmcp-display-glue.h \
gdm-manager-glue.h \
gdm-static-display-glue.h \
gdm-transient-display-glue.h \
......@@ -59,13 +58,6 @@ gdm-display-glue.c gdm-display-glue.h: gdm-display.xml Makefile.am
--generate-c-code=gdm-display-glue \
$(srcdir)/gdm-display.xml
gdm-xdmcp-display-glue.c gdm-xdmcp-display-glue.h: gdm-xdmcp-display.xml Makefile.am
$(AM_V_GEN)gdbus-codegen \
--c-namespace=GdmDBus \
--interface-prefix=org.gnome.DisplayManager \
--generate-c-code=gdm-xdmcp-display-glue \
$(srcdir)/gdm-xdmcp-display.xml
gdm-transient-display-glue.c gdm-transient-display-glue.h: gdm-transient-display.xml Makefile.am
$(AM_V_GEN)gdbus-codegen \
--c-namespace=GdmDBus \
......@@ -354,8 +346,6 @@ XDMCP_SOURCES = \
$(NULL)
XDMCP_nodist_SOURCES = \
gdm-xdmcp-display-glue.c \
gdm-xdmcp-display-glue.h \
gdm-xdmcp-chooser-slave-glue.c \
gdm-xdmcp-chooser-slave-glue.h \
$(NULL)
......@@ -405,7 +395,6 @@ CLEANFILES = \
gdm-static-display-glue.c \
gdm-transient-display-glue.c \
gdm-xdmcp-chooser-slave-glue.c \
gdm-xdmcp-display-glue.c \
$(BUILT_SOURCES) \
$(NULL)
......@@ -416,7 +405,6 @@ EXTRA_DIST = \
gdm-slave.xml \
gdm-xdmcp-chooser-slave.xml \
gdm-display.xml \
gdm-xdmcp-display.xml \
gdm-static-display.xml \
gdm-transient-display.xml \
gdm-local-display-factory.xml \
......
......@@ -37,7 +37,6 @@
#include "gdm-display.h"
#include "gdm-xdmcp-chooser-display.h"
#include "gdm-xdmcp-display-glue.h"
#include "gdm-xdmcp-chooser-slave-glue.h"
#include "gdm-common.h"
......@@ -52,7 +51,6 @@
struct GdmXdmcpChooserDisplayPrivate
{
GdmDBusXdmcpDisplay *skeleton;
GdmDBusXdmcpChooserSlave *slave_proxy;
};
......@@ -121,32 +119,12 @@ gdm_xdmcp_chooser_display_set_slave_bus_name (GdmDisplay *display,
return GDM_DISPLAY_CLASS (gdm_xdmcp_chooser_display_parent_class)->set_slave_bus_name (display, name, error);
}
static GObject *
gdm_xdmcp_chooser_display_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
GdmXdmcpChooserDisplay *display;
display = GDM_XDMCP_CHOOSER_DISPLAY (G_OBJECT_CLASS (gdm_xdmcp_chooser_display_parent_class)->constructor (type,
n_construct_properties,
construct_properties));
display->priv->skeleton = GDM_DBUS_XDMCP_DISPLAY (gdm_dbus_xdmcp_display_skeleton_new ());
g_dbus_object_skeleton_add_interface (gdm_display_get_object_skeleton (GDM_DISPLAY (display)),
G_DBUS_INTERFACE_SKELETON (display->priv->skeleton));
return G_OBJECT (display);
}
static void
gdm_xdmcp_chooser_display_class_init (GdmXdmcpChooserDisplayClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
object_class->constructor = gdm_xdmcp_chooser_display_constructor;
object_class->finalize = gdm_xdmcp_chooser_display_finalize;
display_class->set_slave_bus_name = gdm_xdmcp_chooser_display_set_slave_bus_name;
......@@ -187,7 +165,6 @@ gdm_xdmcp_chooser_display_finalize (GObject *object)
g_return_if_fail (chooser_display->priv != NULL);
g_clear_object (&chooser_display->priv->slave_proxy);
g_clear_object (&chooser_display->priv->skeleton);
G_OBJECT_CLASS (gdm_xdmcp_chooser_display_parent_class)->finalize (object);
}
......
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.gnome.DisplayManager.XdmcpDisplay">
</interface>
</node>
......@@ -37,7 +37,6 @@
#include "gdm-xdmcp-display.h"
#include "gdm-xdmcp-greeter-display.h"
#include "gdm-xdmcp-display-glue.h"
#include "gdm-common.h"
#include "gdm-address.h"
......@@ -46,7 +45,6 @@
struct GdmXdmcpGreeterDisplayPrivate
{
GdmDBusXdmcpDisplay *skeleton;
GdmAddress *remote_address;
gint32 session_number;
};
......@@ -64,32 +62,12 @@ static gboolean gdm_xdmcp_greeter_display_finish (GdmDisplay *display);
G_DEFINE_TYPE (GdmXdmcpGreeterDisplay, gdm_xdmcp_greeter_display, GDM_TYPE_XDMCP_DISPLAY)
static GObject *
gdm_xdmcp_greeter_display_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
GdmXdmcpGreeterDisplay *display;
display = GDM_XDMCP_GREETER_DISPLAY (G_OBJECT_CLASS (gdm_xdmcp_greeter_display_parent_class)->constructor (type,
n_construct_properties,
construct_properties));
display->priv->skeleton = GDM_DBUS_XDMCP_DISPLAY (gdm_dbus_xdmcp_display_skeleton_new ());
g_dbus_object_skeleton_add_interface (gdm_display_get_object_skeleton (GDM_DISPLAY (display)),
G_DBUS_INTERFACE_SKELETON (display->priv->skeleton));
return G_OBJECT (display);
}
static void
gdm_xdmcp_greeter_display_class_init (GdmXdmcpGreeterDisplayClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
object_class->constructor = gdm_xdmcp_greeter_display_constructor;
object_class->finalize = gdm_xdmcp_greeter_display_finalize;
display_class->finish = gdm_xdmcp_greeter_display_finish;
......@@ -115,8 +93,6 @@ gdm_xdmcp_greeter_display_finalize (GObject *object)
g_return_if_fail (xdmcp_greeter_display->priv != NULL);
g_clear_object (&xdmcp_greeter_display->priv->skeleton);
G_OBJECT_CLASS (gdm_xdmcp_greeter_display_parent_class)->finalize (object);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment