Merge lp:~bfiller/unity-2d/wait-for-session-again into lp:unity-2d/3.0

[Florian Boucault]

This is to fix LP: #716167 and LP: #706248. We thought it was previously fixed but I just ran into a case where it didn't work using the latest code. Debugging showed me the app was being destroyed before queryEndSession() even got called the first time and it didn't wait because m_waitingForEndSession = false by default.

So the fix is to change the default to true. This should handle all the known cases now. I also lowered the timeout to 3 secs would should be sufficient.

[Aurélien Gâteau (agateau)]

That's weird, but sometimes gnome-session is full of mystery.

I would suggest however to keep m_waitingForEndSession to false by default and set it to true only if we successfully register with gnome-session (ie in slotRegisterClientFinished()).

review: Needs Fixing

[Bill Filler (bfiller)]

Yes that is better. I'll give it a try.

On Mar 23, 2011, at 7:41 AM, Aurélien Gâteau <email address hidden> wrote:

> Review: Needs Fixing
> That's weird, but sometimes gnome-session is full of mystery.
>
> I would suggest however to keep m_waitingForEndSession to false by default and set it to true only if we successfully register with gnome-session (ie in slotRegisterClientFinished()).
> --
> https://code.launchpad.net/~bfiller/unity-2d/wait-for-session-again/+merge/54436
> You are the owner of lp:~bfiller/unity-2d/wait-for-session-again.

[Aurélien Gâteau (agateau)]

Time was running out, so Florian asked me to merged your changes. It's in trunk now, with the small change I suggested.

=== modified file 'libunity-2d-private/src/gnomesessionclient.cpp'
--- libunity-2d-private/src/gnomesessionclient.cpp	2011-03-22 15:18:46 +0000
+++ libunity-2d-private/src/gnomesessionclient.cpp	2011-03-22 23:02:29 +0000
@@ -39,7 +39,7 @@
 static const char* SM_CLIENT_DBUS_INTERFACE = "org.gnome.SessionManager.ClientPrivate";
 
 // Number of seconds to wait for gnome-session to call us back
-static const int MAX_END_SESSION_WAIT = 5;
+static const int MAX_END_SESSION_WAIT = 3;
 
 struct GnomeSessionClientPrivate
 {
@@ -72,7 +72,7 @@
 : QObject(parent)
 , d(new GnomeSessionClientPrivate(applicationId))
 {
-    d->m_waitingForEndSession = false;
+    d->m_waitingForEndSession = true;
     connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()),
         SLOT(waitForEndSession()));
 }
@@ -128,8 +128,6 @@
 void GnomeSessionClient::queryEndSession()
 {
     UQ_DEBUG;
-    d->m_waitingForEndSession = true;
-
     if (!d->sendEndSessionResponse()) {
       d->m_waitingForEndSession = false;
     }