[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=572a42d

The following commit has been merged in the master branch:
commit 572a42d5e941727726de657b2fe3d17e845cd9d4
Merge: c3b2ab81a3026f353a516de1b86e15eceb435cc9 6f648e60afd8228cb0edbaff7b344fb93f11eaec
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Thu Dec 12 04:10:52 2013 +0600

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	telepathy-mpris.cpp

 telepathy-mpris.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --cc telepathy-mpris.cpp
index 529a100,76aa893..1c7b98c
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@@ -164,12 -160,13 +164,10 @@@ void TelepathyMPRIS::watchPlayer(const 
  
  void TelepathyMPRIS::requestPlaybackStatus(const QString& service)
  {
-     QDBusInterface mprisInterface(service,
-                                   mprisPath,
-                                   dbusInterfaceProperties);
 -    QDBusMessage mprisMsg = QDBusMessage::createMethodCall(service,
 -                                                           QLatin1String("/org/mpris/MediaPlayer2"),
 -                                                           QLatin1String("org.freedesktop.DBus.Properties"),
 -                                                           QLatin1String("GetAll"));
 -    mprisMsg.setArguments(QList<QVariant>() << QLatin1String("org.mpris.MediaPlayer2.Player"));
++    QDBusMessage mprisMsg = QDBusMessage::createMethodCall(service, mprisPath, dbusInterfaceProperties, QLatin1String("GetAll"));
++    mprisMsg.setArguments(QList<QVariant>() << mprisInterfaceName);
  
-     QDBusPendingCall call = mprisInterface.asyncCall(QLatin1String("GetAll"),
-                                                      mprisInterfaceName);
+     QDBusPendingCall call = QDBusConnection::sessionBus().asyncCall(mprisMsg);
  
      QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
      connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),

-- 
ktp-kded-integration-module packaging