[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=3ec2d96

The following commit has been merged in the master branch:
commit 3ec2d96680674c9d40f824ad3d0899c9d9b1e5a1
Author: Siddhartha Sahu <sh.siddhartha at gmail.com>
Date:   Wed Jul 2 16:09:43 2014 +0530

    Fix missing icon for unknown presence types
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 KTp/presence.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/presence.cpp b/KTp/presence.cpp
index 84e7bc5..9936db3 100644
--- a/KTp/presence.cpp
+++ b/KTp/presence.cpp
@@ -73,7 +73,7 @@ QString Presence::iconName(bool useImIcons) const
     case Tp::ConnectionPresenceTypeOffline:
         return useImIcons ? QLatin1String("im-user-offline") : QLatin1String("user-offline");
     default:
-        return QString();
+        return useImIcons ? QLatin1String("im-user-offline") : QLatin1String("user-offline");
     }
 }
 

-- 
ktp-common-internals packaging