[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=0877fda

The following commit has been merged in the master branch:
commit 0877fda295f0ba28707d826d82ccd307ef3d393f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Apr 11 20:37:10 2012 +0100

    Fix now playing.
    
    Don't shadow member variables when initialising them, as that means it won't work.
---
 telepathy-mpris.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index c3c419d..7b52fed 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -180,7 +180,7 @@ void TelepathyMPRIS::onSettingsChanged()
     //if the plugin was disabled and is now enabled
     if (!isEnabled() && pluginEnabled) {
         setEnabled(true);
-        QString m_nowPlayingText = kdedConfig.readEntry(QLatin1String("nowPlayingText"),
+        m_nowPlayingText = kdedConfig.readEntry(QLatin1String("nowPlayingText"),
                                                   i18nc("The default text displayed by now playing plugin. "
                                                         "track title: %1, artist: %2, album: %3",
                                                         "Now listening to %1 by %2 from album %3",

-- 
ktp-kded-integration-module packaging