[gdm/wip/rstrode/wayland-filtering: 4/9] local-display-factory: don't sweat hardcoding seat0 for transient displays
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm/wip/rstrode/wayland-filtering: 4/9] local-display-factory: don't sweat hardcoding seat0 for transient displays
- Date: Wed, 4 Nov 2015 20:58:47 +0000 (UTC)
commit 8d97e91c8611b27c3e7d5e771dc0cd899582808e
Author: Ray Strode <rstrode redhat com>
Date: Wed Nov 4 14:36:26 2015 -0500
local-display-factory: don't sweat hardcoding seat0 for transient displays
seat0 is the only thing that has a chance of supporting multiple
sessions at th moment, so drop the FIXME that we won't be making
traction on.
daemon/gdm-local-display-factory.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 85f6cb4..d06f378 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -42,8 +42,6 @@
#define GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GDM_TYPE_LOCAL_DISPLAY_FACTORY, GdmLocalDisplayFactoryPrivate))
-#define SYSTEMD_SEAT0_PATH "seat0"
-
#define GDM_DBUS_PATH "/org/gnome/DisplayManager"
#define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
#define GDM_MANAGER_DBUS_NAME "org.gnome.DisplayManager.LocalDisplayFactory"
@@ -187,13 +185,6 @@ store_display (GdmLocalDisplayFactory *factory,
gdm_display_store_add (store, display);
}
-static const char *
-get_seat_of_transient_display (GdmLocalDisplayFactory *factory)
-{
- /* FIXME: don't hardcode seat */
- return SYSTEMD_SEAT0_PATH;
-}
-
/*
Example:
dbus-send --system --dest=org.gnome.DisplayManager \
@@ -208,7 +199,6 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact
{
gboolean ret;
GdmDisplay *display = NULL;
- const char *seat_id;
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
@@ -218,9 +208,8 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact
display = gdm_local_display_new ();
- seat_id = get_seat_of_transient_display (factory);
g_object_set (display,
- "seat-id", seat_id,
+ "seat-id", "seat0"
"allow-timed-login", FALSE,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]