Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Molkentin <danimo@owncloud.com>2013-05-22 19:39:49 +0400
committerDaniel Molkentin <danimo@owncloud.com>2013-05-22 19:39:49 +0400
commitdbc085d4d485cada1381d470181979d25f14ec6c (patch)
treef7caf37d92aac6ab692fd5513b84d86533d37d5b
parent804eaa700e833340ac60dd2b09b927cc60ce1df5 (diff)
Fix systray class when built without FDO supportv1.3.0-beta1
-rw-r--r--src/mirall/systray.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mirall/systray.cpp b/src/mirall/systray.cpp
index 7c0535096..934f4e121 100644
--- a/src/mirall/systray.cpp
+++ b/src/mirall/systray.cpp
@@ -26,21 +26,17 @@
void Systray::showMessage(const QString & title, const QString & message, MessageIcon icon, int millisecondsTimeoutHint)
{
- bool useFdoNotifications = false;
#ifdef USE_FDO_NOTIFICATIONS
if(QDBusInterface(NOTIFICATIONS_SERVICE, NOTIFICATIONS_PATH, NOTIFICATIONS_IFACE).isValid()) {
- useFdoNotifications = true;
- }
-#endif
-
- if (useFdoNotifications) {
QList<QVariant> args = QList<QVariant>() << "owncloud" << quint32(0) << "owncloud"
<< title << message << QStringList () << QVariantMap() << qint32(-1);
QDBusMessage method = QDBusMessage::createMethodCall(NOTIFICATIONS_SERVICE, NOTIFICATIONS_PATH, NOTIFICATIONS_IFACE, "Notify");
method.setArguments(args);
QDBusConnection::sessionBus().asyncCall(method);
- } else {
+ } else
+#endif
+ {
QSystemTrayIcon::showMessage(title, message, icon, millisecondsTimeoutHint);
}
}