[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=502ae9b

The following commit has been merged in the master branch:
commit 502ae9bf1cced4907a29a15cfaeaff1f4ec49afd
Author: Weng Xuetian <wengxt at gmail.com>
Date:   Sun Sep 29 22:15:19 2013 -0400

    always reload now playing text on settings change
    
    REVIEW: 112992
    BUG: 305820
    FIXED-IN: 0.7.0
---
 telepathy-mpris.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 4236e39..6cd3e20 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -148,14 +148,15 @@ void TelepathyMPRIS::onSettingsChanged()
         return;
     }
 
+    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",
+                                                    QLatin1String("%title"), QLatin1String("%artist"), QLatin1String("%album")));
+
     //if the plugin was disabled and is now enabled
     if (!isEnabled() && pluginEnabled) {
         setEnabled(true);
-        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",
-                                                        QLatin1String("%title"), QLatin1String("%artist"), QLatin1String("%album")));
         detectPlayers();
     }
 }

-- 
ktp-kded-integration-module packaging