[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=1524efe

The following commit has been merged in the master branch:
commit 1524efe1fe96b7494819d7b8b1014860b7f5db87
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 21 21:43:46 2011 +0000

    If no user avatar is available for the theme header, use the standard icon.
    
    BUG: 269057
    REVIEW: 100909
    Reviewed by Forian Reinhard
---
 lib/adium-theme-view.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index abcfd7d..b7a88f8 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -251,8 +251,8 @@ QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const AdiumT
     htmlTemplate.replace("%sourceName%", info.sourceName());
     htmlTemplate.replace("%destinationName%", info.destinationName());
     htmlTemplate.replace("%destinationDisplayName%", info.destinationDisplayName());
-    htmlTemplate.replace("%incomingIconPath%", info.incomingIconPath().toString());
-    htmlTemplate.replace("%outgoingIconPath%", info.outgoingIconPath().toString());
+    htmlTemplate.replace("%incomingIconPath%", (!info.incomingIconPath().isEmpty() ? info.incomingIconPath().toString() : m_defaultAvatar));
+    htmlTemplate.replace("%outgoingIconPath%", (!info.outgoingIconPath().isEmpty() ? info.incomingIconPath().toString() : m_defaultAvatar));
     htmlTemplate.replace("%timeOpened%", KGlobal::locale()->formatDateTime(info.timeOpened()));
 
     //FIXME time fields - remember to do both, steal the complicated one from Kopete code.

-- 
ktp-text-ui packaging