Merge lp:~chrisccoulson/unity-2d/lp1010466 into lp:unity-2d

[Chris Coulson]

[panel] Use the correct event timestamp when closing an application window

[panel] Use the correct event timestamp when closing an application window

[Gerry Boland (gerboland)]

Hi Chris,
the other time we use wnck_window_close, we use "CurrentTime" as the timestamp. Would using this fix the issue also or not?
Thanks
-Gerry

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:1119
http://s-jenkins:8080/job/unity-2d-ci/12/

review: Approve (continuous-integration)

[Chris Coulson (chrisccoulson)]

Using CurrentTime would fix this case too, but it's usually more correct to use the timestamp of the event which triggers the action. I don't mind either way though

[Gerry Boland (gerboland)]

TBH I'm not that pushed either. I'm not fond of CurrentTime=0. I'll accept this as is, thank you!

review: Approve

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-05-25 09:29:49 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-06-13 14:17:22 +0000
@@ -211,8 +211,7 @@
     } else if (HUDClient::instance()->activeInScreen(d->screen())) {
         HUDClient::instance()->setActive(false);
     } else {
-        guint32 timestamp = QDateTime::currentDateTime().toTime_t();
-        wnck_window_close(d->m_window, timestamp);
+        wnck_window_close(d->m_window, QX11Info::appTime());
     }
 }