Merge lp:~sil2100/unity-2d/lp1010466_3.0 into lp:unity-2d/3.0

Proposed by Łukasz Zemczak on 2012-06-13
Status: Merged
Approved by: Gerry Boland on 2012-06-14
Approved revision: 691
Merged at revision: 690
Proposed branch: lp:~sil2100/unity-2d/lp1010466_3.0
Merge into: lp:unity-2d/3.0
Diff against target: 21 lines (+2/-2)
1 file modified
panel/applets/appname/windowhelper.cpp (+2/-2)
To merge this branch: bzr merge lp:~sil2100/unity-2d/lp1010466_3.0
Reviewer Review Type Date Requested Status
Gerry Boland (community) 2012-06-13 Approve on 2012-06-13
Review via email: mp+110112@code.launchpad.net

Commit message

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

Description of the change

Backported from 5.0:

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

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

Looks good, will approve/merge on your mark.

review: Approve
lp:~sil2100/unity-2d/lp1010466_3.0 updated on 2012-06-14
691. By Łukasz Zemczak on 2012-06-14

Adding a missing include and essentially fixing the build.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/applets/appname/windowhelper.cpp'
2--- panel/applets/appname/windowhelper.cpp 2011-07-12 13:45:20 +0000
3+++ panel/applets/appname/windowhelper.cpp 2012-06-14 08:02:20 +0000
4@@ -42,6 +42,7 @@
5 #include <QDateTime>
6 #include <QApplication>
7 #include <QDesktopWidget>
8+#include <QX11Info>
9
10 struct WindowHelperPrivate
11 {
12@@ -143,8 +144,7 @@
13
14 void WindowHelper::close()
15 {
16- guint32 timestamp = QDateTime::currentDateTime().toTime_t();
17- wnck_window_close(d->m_window, timestamp);
18+ wnck_window_close(d->m_window, QX11Info::appTime());
19 }
20
21 void WindowHelper::minimize()

Subscribers

People subscribed via source and target branches