|
 |
75a7a3 |
From 4b07f66e36bb00d022494c9118e4dc12921bce6d Mon Sep 17 00:00:00 2001
|
|
|
75a7a3 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
75a7a3 |
Date: Mon, 3 Apr 2017 13:25:58 -0400
|
|
|
75a7a3 |
Subject: [PATCH] local-display-factory: add missing comma to fix user
|
|
|
75a7a3 |
switching
|
|
|
75a7a3 |
|
|
|
75a7a3 |
commit 4b47633b36a22195e7976a8e597862eff695ca86 refactored some code
|
|
|
75a7a3 |
and inadvertently dropped an important comma, which broke user
|
|
|
75a7a3 |
switching.
|
|
|
75a7a3 |
|
|
|
75a7a3 |
This commit reintroduces the comma.
|
|
|
75a7a3 |
|
|
|
75a7a3 |
https://bugzilla.gnome.org/show_bug.cgi?id=780879
|
|
|
75a7a3 |
---
|
|
|
75a7a3 |
daemon/gdm-local-display-factory.c | 2 +-
|
|
|
75a7a3 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
75a7a3 |
|
|
|
75a7a3 |
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
|
|
|
75a7a3 |
index 70987c71..7a4643d0 100644
|
|
|
75a7a3 |
--- a/daemon/gdm-local-display-factory.c
|
|
|
75a7a3 |
+++ b/daemon/gdm-local-display-factory.c
|
|
|
75a7a3 |
@@ -192,61 +192,61 @@ store_display (GdmLocalDisplayFactory *factory,
|
|
|
75a7a3 |
/org/gnome/DisplayManager/Manager \
|
|
|
75a7a3 |
org.gnome.DisplayManager.Manager.GetDisplays
|
|
|
75a7a3 |
*/
|
|
|
75a7a3 |
gboolean
|
|
|
75a7a3 |
gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *factory,
|
|
|
75a7a3 |
char **id,
|
|
|
75a7a3 |
GError **error)
|
|
|
75a7a3 |
{
|
|
|
75a7a3 |
gboolean ret;
|
|
|
75a7a3 |
GdmDisplay *display = NULL;
|
|
|
75a7a3 |
|
|
|
75a7a3 |
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
ret = FALSE;
|
|
|
75a7a3 |
|
|
|
75a7a3 |
g_debug ("GdmLocalDisplayFactory: Creating transient display");
|
|
|
75a7a3 |
|
|
|
75a7a3 |
#ifdef ENABLE_USER_DISPLAY_SERVER
|
|
|
75a7a3 |
display = gdm_local_display_new ();
|
|
|
75a7a3 |
#else
|
|
|
75a7a3 |
if (display == NULL) {
|
|
|
75a7a3 |
guint32 num;
|
|
|
75a7a3 |
|
|
|
75a7a3 |
num = take_next_display_number (factory);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
display = gdm_legacy_display_new (num);
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
#endif
|
|
|
75a7a3 |
|
|
|
75a7a3 |
g_object_set (display,
|
|
|
75a7a3 |
- "seat-id", "seat0"
|
|
|
75a7a3 |
+ "seat-id", "seat0",
|
|
|
75a7a3 |
"allow-timed-login", FALSE,
|
|
|
75a7a3 |
NULL);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
store_display (factory, display);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
if (! gdm_display_manage (display)) {
|
|
|
75a7a3 |
display = NULL;
|
|
|
75a7a3 |
goto out;
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
if (! gdm_display_get_id (display, id, NULL)) {
|
|
|
75a7a3 |
display = NULL;
|
|
|
75a7a3 |
goto out;
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
ret = TRUE;
|
|
|
75a7a3 |
out:
|
|
|
75a7a3 |
/* ref either held by store or not at all */
|
|
|
75a7a3 |
g_object_unref (display);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
return ret;
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
static void
|
|
|
75a7a3 |
on_display_status_changed (GdmDisplay *display,
|
|
|
75a7a3 |
GParamSpec *arg1,
|
|
|
75a7a3 |
GdmLocalDisplayFactory *factory)
|
|
|
75a7a3 |
{
|
|
|
75a7a3 |
int status;
|
|
|
75a7a3 |
GdmDisplayStore *store;
|
|
|
75a7a3 |
--
|
|
|
75a7a3 |
2.12.0
|
|
|
75a7a3 |
|