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

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Gerry Boland
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) Approve
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.
Revision history for this message
Gerry Boland (gerboland) wrote :

Looks good, will approve/merge on your mark.

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

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
=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp 2011-07-12 13:45:20 +0000
+++ panel/applets/appname/windowhelper.cpp 2012-06-14 08:02:20 +0000
@@ -42,6 +42,7 @@
42#include <QDateTime>42#include <QDateTime>
43#include <QApplication>43#include <QApplication>
44#include <QDesktopWidget>44#include <QDesktopWidget>
45#include <QX11Info>
4546
46struct WindowHelperPrivate47struct WindowHelperPrivate
47{48{
@@ -143,8 +144,7 @@
143144
144void WindowHelper::close()145void WindowHelper::close()
145{146{
146 guint32 timestamp = QDateTime::currentDateTime().toTime_t();147 wnck_window_close(d->m_window, QX11Info::appTime());
147 wnck_window_close(d->m_window, timestamp);
148}148}
149149
150void WindowHelper::minimize()150void WindowHelper::minimize()

Subscribers

People subscribed via source and target branches