1 diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h
2 index 2ef7026..41f0791 100644
3 --- a/kdm/backend/greet.h
4 +++ b/kdm/backend/greet.h
5 @@ -146,8 +146,6 @@ from the copyright holder.
6 #define G_DChoose 3 /* run chooser */
9 -#define G_Interact 4 /* greeter got user input. possible crash is probably not spontaneous. */
11 #define G_Shutdown 101 /* 5*int, string; async */
12 # define SHUT_REBOOT 1 /* how */
14 diff --git a/kdm/backend/session.c b/kdm/backend/session.c
15 index 85ab1d7..1b47e9c 100644
16 --- a/kdm/backend/session.c
17 +++ b/kdm/backend/session.c
18 @@ -409,12 +409,16 @@ void
22 + static time_t lastStart;
30 + if (now < lastStart + 10) /* XXX should use some readiness indicator instead */
31 + sessionExit(EX_UNMANAGE_DPY);
32 ASPrintf(&name, "greeter for display %s", td->name);
33 debug("starting %s\n", name);
35 @@ -443,6 +447,8 @@ openGreeter()
36 sessionExit(EX_UNMANAGE_DPY);
38 debug("%s ready\n", name);
44 @@ -544,7 +550,7 @@ manageSession(void)
47 volatile int clientPid = -1;
48 - time_t tdiff, startt;
51 debug("manageSession %s\n", td->name);
52 if ((ex = Setjmp(abortSession))) {
53 @@ -576,13 +582,10 @@ manageSession(void)
55 tdiff = now - td->hstent->lastExit - td->openDelay;
56 if (autoLogon(tdiff)) {
57 - if (!verify(conv_auto, False)) {
59 + if (!verify(conv_auto, False))
67 if (((td->displayType & d_location) == dLocal) &&
68 @@ -596,10 +599,6 @@ manageSession(void)
69 G_GreetTimed : G_Greet);
71 cmd = ctrlGreeterWait(True);
72 - if (cmd == G_Interact) {
77 while (cmd == G_DChoose) {
79 @@ -616,9 +615,6 @@ manageSession(void)
80 logError("Received unknown command %d from greeter\n", cmd);
84 - if (now < startt + 120) /* Greeter crashed spontaneously. Avoid endless loop. */
85 - sessionExit(EX_UNMANAGE_DPY);
89 diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
90 index f169248..1bb744c 100644
91 --- a/kdm/kfrontend/kgapp.cpp
92 +++ b/kdm/kfrontend/kgapp.cpp
93 @@ -74,7 +74,7 @@ sigAlarm(int)
95 GreeterApp::GreeterApp(int &argc, char **argv) :
96 inherited(argc, argv),
97 - regrabPtr(false), regrabKbd(false), initalBusy(true), sendInteract(false),
98 + regrabPtr(false), regrabKbd(false), initalBusy(true),
101 pingInterval = _isLocal ? 0 : _pingInterval;
102 @@ -203,14 +203,6 @@ GreeterApp::x11EventFilter(XEvent * ev)
109 - if (sendInteract) {
110 - sendInteract = false;
111 - // We assume that no asynchronous communication is going on
112 - // before the first user interaction.
113 - gSendInt(G_Interact);
117 @@ -487,7 +479,6 @@ main(int argc ATTR_UNUSED, char **argv)
120 QObject::connect(dialog, SIGNAL(ready()), &app, SLOT(markReady()));
121 - app.enableSendInteract();
122 debug("entering event loop\n");
123 rslt = dialog->exec();
124 debug("left event loop\n");
125 diff --git a/kdm/kfrontend/kgapp.h b/kdm/kfrontend/kgapp.h
126 index b7c1b97..0979950 100644
127 --- a/kdm/kfrontend/kgapp.h
128 +++ b/kdm/kfrontend/kgapp.h
129 @@ -37,7 +37,6 @@ class GreeterApp : public QApplication {
131 GreeterApp(int &argc, char **argv);
133 - void enableSendInteract() { sendInteract = true; }
134 virtual bool x11EventFilter(XEvent *);
137 @@ -51,7 +50,7 @@ class GreeterApp : public QApplication {
140 int pingInterval, pingTimerId;
141 - bool regrabPtr, regrabKbd, initalBusy, sendInteract;
142 + bool regrabPtr, regrabKbd, initalBusy;
143 QPoint mouseStartPos, dialogStartPos;