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

[Marco Trevisan (Treviño)]

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

[Lukáš Tinkl (lukas-kde)]

LGTM, works fine

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-07-15 08:55:13 +0000
+++ debian/control	2016-11-16 18:13:35 +0000
@@ -10,6 +10,7 @@
                libfontconfig1-dev,
                libinput-dev,
                libmtdev-dev,
+               libqt5x11extras5-dev,
                libudev-dev,
                libxrender-dev,
                qtbase5-dev (>= 5.2.0),

=== modified file 'src/appmenuplatformsystemtrayicon.cpp'
--- src/appmenuplatformsystemtrayicon.cpp	2016-05-11 14:54:49 +0000
+++ src/appmenuplatformsystemtrayicon.cpp	2016-11-16 18:13:35 +0000
@@ -21,6 +21,7 @@
 #include <QtDBus/qdbusconnection.h>
 #include <QtDBus/qdbusconnectioninterface.h>
 #include <QtDBus/qdbusinterface.h>
+#include <QX11Info>
 #include "appmenuplatformmenu.h"
 #include "appmenuplatformsystemtrayicon.h"
 #include "iconcache.h"
@@ -223,6 +224,11 @@
 {
     Q_UNUSED(x);
     Q_UNUSED(y);
+    // Workarounds LP: #627195
+    if (QX11Info::isPlatformX11() &&
+        QString::fromUtf8(getenv("XDG_CURRENT_DESKTOP")).split(':').contains("Unity")) {
+        QX11Info::setAppUserTime(0);
+    }
     emit activated(Trigger);
 }
 

=== modified file 'src/src.pro'
--- src/src.pro	2014-12-13 15:38:51 +0000
+++ src/src.pro	2016-11-16 18:13:35 +0000
@@ -4,7 +4,7 @@
 PLUGIN_CLASS_NAME = AppMenuPlatformThemePlugin
 load(qt_plugin)
 
-QT += core-private gui-private platformsupport-private dbus widgets
+QT += core-private gui-private platformsupport-private dbus widgets x11extras
 DBUS_INTERFACES += com.canonical.AppMenu.Registrar.xml
 DBUS_ADAPTORS += org.kde.StatusNotifierItem.xml
 QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS += -i dbusstructures.h