release 3.3.3

This commit is contained in:
2017-08-03 01:47:10 +03:00
parent 707fa727c5
commit 081f7a3c88
10 changed files with 46 additions and 35 deletions

View File

@ -1,25 +0,0 @@
diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp
index b8a0ec1..17d90bc 100644
--- a/sources/extsysmonsources/playersource.cpp
+++ b/sources/extsysmonsources/playersource.cpp
@@ -73,8 +73,10 @@ QString PlayerSource::getAutoMpris() const
{
QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
QDBus::BlockWithGui, "ListNames");
- if (listServices.arguments().isEmpty())
+ if (listServices.arguments().isEmpty()) {
+ qCWarning(LOG_ESS) << "Could not find any DBus service";
return "";
+ }
QStringList arguments = listServices.arguments().first().toStringList();
for (auto &arg : arguments) {
@@ -353,7 +355,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
= QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
QDBusMessage request = QDBusMessage::createMethodCall(
QString("org.mpris.MediaPlayer2.%1").arg(_mpris),
- "/org/mpris/MediaPlayer2", "", "Get");
+ "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
request.setArguments(args);
QDBusMessage response
= bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);

View File

@ -1,14 +1,15 @@
diff --git a/sources/awdebug.h b/sources/awdebug.h
index 8447c65..9f8e298 100644
index 8447c65..4eef49a 100644
--- a/sources/awdebug.h
+++ b/sources/awdebug.h
@@ -23,10 +23,14 @@
@@ -23,10 +23,15 @@
#include "version.h"
+#ifndef qCInfo
+#define qCInfo qCDebug
+#endif
+
+
namespace AWDebug
{
@ -19,7 +20,7 @@ index 8447c65..9f8e298 100644
"fatal}FF%{endif}][%{category}][%{function}] "
"%{message}";
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
index d29672e..f15a729 100644
index d6d5d1a..ee301df 100644
--- a/sources/awesome-widget/plugin/awkeysaggregator.h
+++ b/sources/awesome-widget/plugin/awkeysaggregator.h
@@ -21,6 +21,7 @@
@ -28,5 +29,5 @@ index d29672e..f15a729 100644
#include <QObject>
+#include <QStringList>
#include "version.h"
class AWFormatterHelper;