- Flush X event queue after setting _XROOTPMAP_ID so there's no race with
settings daemon reading the property
This commit is contained in:
parent
b71ee620ec
commit
67928d9d79
@ -1,6 +1,6 @@
|
||||
diff -up gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window gdm-2.23.92/daemon/gdm-simple-slave.c
|
||||
--- gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window 2008-09-03 16:52:53.000000000 -0400
|
||||
+++ gdm-2.23.92/daemon/gdm-simple-slave.c 2008-09-16 15:29:15.000000000 -0400
|
||||
+++ gdm-2.23.92/daemon/gdm-simple-slave.c 2008-09-19 18:18:50.000000000 -0400
|
||||
@@ -825,6 +825,15 @@ setup_server (GdmSimpleSlave *slave)
|
||||
{
|
||||
/* Set the busy cursor */
|
||||
@ -19,7 +19,7 @@ diff -up gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window gdm-2.23.92/daem
|
||||
static void
|
||||
diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-slave.c
|
||||
--- gdm-2.23.92/daemon/gdm-slave.c.save-root-window 2008-08-26 15:04:00.000000000 -0400
|
||||
+++ gdm-2.23.92/daemon/gdm-slave.c 2008-09-16 15:39:18.000000000 -0400
|
||||
+++ gdm-2.23.92/daemon/gdm-slave.c 2008-09-22 11:06:36.000000000 -0400
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
|
||||
@ -28,7 +28,7 @@ diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-
|
||||
#include <X11/cursorfont.h> /* for watch cursor */
|
||||
|
||||
#include "gdm-common.h"
|
||||
@@ -341,6 +342,75 @@ gdm_slave_run_script (GdmSlave *slave,
|
||||
@@ -341,6 +342,77 @@ gdm_slave_run_script (GdmSlave *slave,
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -99,6 +99,8 @@ diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-
|
||||
+ for (i = 0; i < number_of_screens; i++) {
|
||||
+ gdm_slave_save_root_window_of_screen (slave, atom, i);
|
||||
+ }
|
||||
+
|
||||
+ XSync (slave->priv->server_display, False);
|
||||
+}
|
||||
+
|
||||
void
|
||||
@ -106,7 +108,7 @@ diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-
|
||||
{
|
||||
diff -up gdm-2.23.92/daemon/gdm-slave.h.save-root-window gdm-2.23.92/daemon/gdm-slave.h
|
||||
--- gdm-2.23.92/daemon/gdm-slave.h.save-root-window 2008-08-26 15:04:00.000000000 -0400
|
||||
+++ gdm-2.23.92/daemon/gdm-slave.h 2008-09-16 15:29:15.000000000 -0400
|
||||
+++ gdm-2.23.92/daemon/gdm-slave.h 2008-09-19 18:18:50.000000000 -0400
|
||||
@@ -69,6 +69,7 @@ gboolean gdm_slave_switch_to_
|
||||
|
||||
gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave);
|
||||
|
6
gdm.spec
6
gdm.spec
@ -16,7 +16,7 @@
|
||||
Summary: The GNOME Display Manager
|
||||
Name: gdm
|
||||
Version: 2.23.92
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Group: User Interface/X
|
||||
@ -322,6 +322,10 @@ fi
|
||||
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
|
||||
|
||||
%changelog
|
||||
* Mon Sep 22 2008 Ray Strode <rstrode@redhat.com> - 1:2.23.92-10
|
||||
- Flush X event queue after setting _XROOTPMAP_ID so there's
|
||||
no race with settings daemon reading the property
|
||||
|
||||
* Fri Sep 19 2008 Ray Strode <rstrode@redhat.com> - 1:2.23.92-9
|
||||
- Fix crash from language dialog
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user