[gdm] xdmcp-greeter-display: drop class
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] xdmcp-greeter-display: drop class
- Date: Wed, 18 Feb 2015 22:42:50 +0000 (UTC)
commit 33bb9cfd9bac812338a5fdd1f7351f8e7606dcd1
Author: Ray Strode <rstrode redhat com>
Date: Mon Jan 19 09:09:49 2015 -0500
xdmcp-greeter-display: drop class
GdmXdmcpGreeterDisplay doesn't do anything that it's parent
class does (except call unmanage from finalize which is strange
and probably wrong).
This commit drops the file and instead just uses GdmXdmcpDisplay
directly, instead.
https://bugzilla.gnome.org/show_bug.cgi?id=744764
daemon/Makefile.am | 2 -
daemon/gdm-xdmcp-display-factory.c | 9 +--
daemon/gdm-xdmcp-display.c | 23 ++++++
daemon/gdm-xdmcp-display.h | 4 +
daemon/gdm-xdmcp-greeter-display.c | 132 ------------------------------------
daemon/gdm-xdmcp-greeter-display.h | 64 -----------------
6 files changed, 31 insertions(+), 203 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 691c939..6b80972 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -238,8 +238,6 @@ XDMCP_SOURCES = \
gdm-xdmcp-display-factory.h \
gdm-xdmcp-display.c \
gdm-xdmcp-display.h \
- gdm-xdmcp-greeter-display.c \
- gdm-xdmcp-greeter-display.h \
gdm-xdmcp-chooser-display.c \
gdm-xdmcp-chooser-display.h \
gdm-xdmcp-chooser-slave.c \
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index 7fb26d6..74c0755 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -53,7 +53,6 @@
#include <X11/Xdmcp.h>
#include "gdm-common.h"
-#include "gdm-xdmcp-greeter-display.h"
#include "gdm-xdmcp-chooser-display.h"
#include "gdm-display-factory.h"
#include "gdm-xdmcp-display-factory.h"
@@ -2111,10 +2110,10 @@ gdm_xdmcp_display_create (GdmXdmcpDisplayFactory *factory,
get_next_session_serial (factory));
g_signal_connect (display, "hostname-selected", G_CALLBACK (on_hostname_selected), factory);
} else {
- display = gdm_xdmcp_greeter_display_new (hostname,
- displaynum,
- address,
- get_next_session_serial (factory));
+ display = gdm_xdmcp_display_new (hostname,
+ displaynum,
+ address,
+ get_next_session_serial (factory));
}
if (display == NULL) {
diff --git a/daemon/gdm-xdmcp-display.c b/daemon/gdm-xdmcp-display.c
index 9b929fa..27ea00d 100644
--- a/daemon/gdm-xdmcp-display.c
+++ b/daemon/gdm-xdmcp-display.c
@@ -198,3 +198,26 @@ gdm_xdmcp_display_init (GdmXdmcpDisplay *xdmcp_display)
xdmcp_display->priv = GDM_XDMCP_DISPLAY_GET_PRIVATE (xdmcp_display);
}
+
+GdmDisplay *
+gdm_xdmcp_display_new (const char *hostname,
+ int number,
+ GdmAddress *address,
+ gint32 session_number)
+{
+ GObject *object;
+ char *x11_display;
+
+ x11_display = g_strdup_printf ("%s:%d", hostname, number);
+ object = g_object_new (GDM_TYPE_XDMCP_DISPLAY,
+ "remote-hostname", hostname,
+ "x11-display-number", number,
+ "x11-display-name", x11_display,
+ "is-local", FALSE,
+ "remote-address", address,
+ "session-number", session_number,
+ NULL);
+ g_free (x11_display);
+
+ return GDM_DISPLAY (object);
+}
diff --git a/daemon/gdm-xdmcp-display.h b/daemon/gdm-xdmcp-display.h
index 10b85a8..e127614 100644
--- a/daemon/gdm-xdmcp-display.h
+++ b/daemon/gdm-xdmcp-display.h
@@ -57,6 +57,10 @@ GType gdm_xdmcp_display_get_type (void);
gint32 gdm_xdmcp_display_get_session_number (GdmXdmcpDisplay *display);
GdmAddress * gdm_xdmcp_display_get_remote_address (GdmXdmcpDisplay *display);
+GdmDisplay * gdm_xdmcp_display_new (const char *hostname,
+ int number,
+ GdmAddress *address,
+ gint32
session_number);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]