Merge lp:~3v1n0/appmenu-qt5/x11-usertime-on-activate into lp:appmenu-qt5

Proposed by Marco Trevisan (Treviño) on 2016-11-16
Status: Merged
Approved by: Lukáš Tinkl on 2016-11-22
Approved revision: 44
Merged at revision: 44
Proposed branch: lp:~3v1n0/appmenu-qt5/x11-usertime-on-activate
Merge into: lp:appmenu-qt5
Diff against target: 48 lines (+8/-1)
3 files modified
debian/control (+1/-0)
src/appmenuplatformsystemtrayicon.cpp (+6/-0)
src/src.pro (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/appmenu-qt5/x11-usertime-on-activate
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) 2016-11-16 Approve on 2016-11-22
Review via email: mp+311055@code.launchpad.net

Commit message

AppMenuPlatformSystemTrayIcon: reset app usertime on activation to ensure compiz will raise it

To post a comment you must log in.
Lukáš Tinkl (lukas-kde) wrote :

LGTM, works fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-07-15 08:55:13 +0000
3+++ debian/control 2016-11-16 18:13:35 +0000
4@@ -10,6 +10,7 @@
5 libfontconfig1-dev,
6 libinput-dev,
7 libmtdev-dev,
8+ libqt5x11extras5-dev,
9 libudev-dev,
10 libxrender-dev,
11 qtbase5-dev (>= 5.2.0),
12
13=== modified file 'src/appmenuplatformsystemtrayicon.cpp'
14--- src/appmenuplatformsystemtrayicon.cpp 2016-05-11 14:54:49 +0000
15+++ src/appmenuplatformsystemtrayicon.cpp 2016-11-16 18:13:35 +0000
16@@ -21,6 +21,7 @@
17 #include <QtDBus/qdbusconnection.h>
18 #include <QtDBus/qdbusconnectioninterface.h>
19 #include <QtDBus/qdbusinterface.h>
20+#include <QX11Info>
21 #include "appmenuplatformmenu.h"
22 #include "appmenuplatformsystemtrayicon.h"
23 #include "iconcache.h"
24@@ -223,6 +224,11 @@
25 {
26 Q_UNUSED(x);
27 Q_UNUSED(y);
28+ // Workarounds LP: #627195
29+ if (QX11Info::isPlatformX11() &&
30+ QString::fromUtf8(getenv("XDG_CURRENT_DESKTOP")).split(':').contains("Unity")) {
31+ QX11Info::setAppUserTime(0);
32+ }
33 emit activated(Trigger);
34 }
35
36
37=== modified file 'src/src.pro'
38--- src/src.pro 2014-12-13 15:38:51 +0000
39+++ src/src.pro 2016-11-16 18:13:35 +0000
40@@ -4,7 +4,7 @@
41 PLUGIN_CLASS_NAME = AppMenuPlatformThemePlugin
42 load(qt_plugin)
43
44-QT += core-private gui-private platformsupport-private dbus widgets
45+QT += core-private gui-private platformsupport-private dbus widgets x11extras
46 DBUS_INTERFACES += com.canonical.AppMenu.Registrar.xml
47 DBUS_ADAPTORS += org.kde.StatusNotifierItem.xml
48 QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS += -i dbusstructures.h

Subscribers

People subscribed via source and target branches