[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=d557db3

The following commit has been merged in the master branch:
commit d557db3e4585058aa0059e4fc887562a10a9afa7
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date:   Sun Jul 17 20:35:09 2011 +0100

    Remove accelerators from presence action text before updating tooltip.
    
    BUG: 276405
    REVIEW: 101982
---
 account-button.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account-button.cpp b/account-button.cpp
index 2ccda54..7763858 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -234,7 +234,7 @@ QString AccountButton::presenceDisplayString(const Tp::Presence &presence)
 {
     foreach (QAction *a, actions()) {
         if (presence.status() == qVariantValue<Tp::Presence>(a->data()).status()) {
-            return a->text();
+            return KGlobal::locale()->removeAcceleratorMarker(a->text());
         }
     }
 

-- 
ktp-contact-list packaging