[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=b158062

The following commit has been merged in the master branch:
commit b158062dcf9b6066ad77408ebfb3b4d1e0869fc3
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 14 18:14:55 2011 +0200

    Use formatLocaleTime instead of formatTime
    
    formatTime is deprecated
---
 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 804ed0a..c834c94 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -471,9 +471,9 @@ QString AdiumThemeView::replaceMessageKeywords(QString &htmlTemplate, const Adiu
     //service
     htmlTemplate.replace(QLatin1String("%service%"), info.service());
     //time
-    htmlTemplate.replace(QLatin1String("%time%"), KGlobal::locale()->formatTime(info.time().time(), true));
+    htmlTemplate.replace(QLatin1String("%time%"), KGlobal::locale()->formatLocaleTime(info.time().time()));
     //shortTime
-    htmlTemplate.replace(QLatin1String("%shortTime%"), KGlobal::locale()->formatTime(info.time().time(), false));
+    htmlTemplate.replace(QLatin1String("%shortTime%"), KGlobal::locale()->formatLocaleTime(info.time().time(), KLocale::TimeWithoutSeconds | KLocale::TimeWithoutAmPm));
     //time{X}
     QRegExp timeRegExp(QLatin1String("%time\{([^}]*)\}%"));
     int pos = 0;

-- 
ktp-text-ui packaging