Merge lp:~3v1n0/sni-qt/x11-usertime-on-activate into lp:sni-qt

[Marco Trevisan (Treviño)]

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

[Lukáš Tinkl (lukas-kde)]

LGTM, works fine

review: Approve

=== modified file 'src/statusnotifieritem.cpp'
--- src/statusnotifieritem.cpp	2015-07-04 13:55:52 +0000
+++ src/statusnotifieritem.cpp	2016-11-16 16:31:01 +0000
@@ -36,6 +36,10 @@
 #include <QTranslator>
 #include <QWheelEvent>
 
+#if defined(Q_WS_X11)
+#include <QX11Info>
+#endif
+
 static const char* SNI_CATEGORY_PROPERTY = "_sni_qt_category";
 static const char* DEFAULT_CATEGORY = "ApplicationStatus";
 
@@ -174,7 +178,7 @@
 void StatusNotifierItem::Activate(int, int)
 {
     SNI_DEBUG;
-    sendActivated(QSystemTrayIcon::Trigger);
+    sendActivatedByTrigger();
 }
 
 void StatusNotifierItem::ContextMenu(int, int)
@@ -288,6 +292,12 @@
 
 void StatusNotifierItem::sendActivatedByTrigger()
 {
+#if defined(Q_WS_X11)
+    // Workarounds LP: #627195
+    if (QString::fromUtf8(getenv("XDG_CURRENT_DESKTOP")).split(':').contains("Unity")) {
+        QX11Info::setAppUserTime(0);
+    }
+#endif
     sendActivated(QSystemTrayIcon::Trigger);
 }