From f929a88473c73c9d86506c2333c091221d30d834 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Mon, 24 Jan 2011 21:25:09 +0000
Subject: [PATCH] Fix mpris

---
 src/core/mpris.cpp      | 4 ----
 src/widgets/osd.h       | 2 --
 src/widgets/osd_x11.cpp | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/src/core/mpris.cpp b/src/core/mpris.cpp
index 4511aea68..915f3569c 100644
--- a/src/core/mpris.cpp
+++ b/src/core/mpris.cpp
@@ -19,10 +19,6 @@
 #include "mpris1.h"
 #include "mpris2.h"
 
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QtConcurrentRun>
-
 namespace mpris {
 
 Mpris::Mpris(Player* player, ArtLoader* art_loader, QObject* parent)
diff --git a/src/widgets/osd.h b/src/widgets/osd.h
index fa4933e4f..ced0cf763 100644
--- a/src/widgets/osd.h
+++ b/src/widgets/osd.h
@@ -129,8 +129,6 @@ class OSD : public QObject {
 #endif  // Q_OS_DARWIN
 
 #ifdef HAVE_DBUS
-  void DoInit();
-
   boost::scoped_ptr<OrgFreedesktopNotificationsInterface> interface_;
   uint notification_id_;
   QDateTime last_notification_time_;
diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp
index 950089b32..b2d484800 100644
--- a/src/widgets/osd_x11.cpp
+++ b/src/widgets/osd_x11.cpp
@@ -24,7 +24,6 @@
 #include "dbus/notification.h"
 #include <QCoreApplication>
 #include <QTextDocument>
-#include <QtConcurrentRun>
 
 using boost::scoped_ptr;
 
@@ -61,10 +60,6 @@ const QDBusArgument& operator>> (const QDBusArgument& arg, QImage& image) {
 void OSD::Init() {
   notification_id_ = 0;
 
-  QtConcurrent::run(this, &OSD::DoInit);
-}
-
-void OSD::DoInit() {
 #ifdef HAVE_DBUS
   interface_.reset(new OrgFreedesktopNotificationsInterface(
       OrgFreedesktopNotificationsInterface::staticInterfaceName(),