[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=5c8f5c3

The following commit has been merged in the master branch:
commit 5c8f5c3a1b00a59cd9aac45ab4b0fe224bcc56a8
Merge: 176084c95a1e77a68b07a7b054bb8b541db5033f c89f5c4f7d249ef43011ea5e77562c846e939b87
Author: Alex Fiestas <afiestas at kde.org>
Date:   Mon Nov 26 17:37:36 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_messages.desktop
    	filters/emoticons/ktptextui_message_filter_emoticons.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
    	lib/adium-theme-message-info.h
    	lib/adium-theme-view.cpp
    	lib/ktptxtui_message_filter.desktop

 lib/adium-theme-message-info.cpp | 2 +-
 lib/adium-theme-view.cpp         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --cc lib/adium-theme-message-info.cpp
index cc4247a,428febc..7726fd2
--- a/lib/adium-theme-message-info.cpp
+++ b/lib/adium-theme-message-info.cpp
@@@ -160,13 -159,3 +160,13 @@@ void AdiumThemeMessageInfo::appendMessa
  {
      d->messageClasses.append(messageClass);
  }
 +
 +QString AdiumThemeMessageInfo::script() const
 +{
 +    return d->script;
 +}
 +
 +void AdiumThemeMessageInfo::setScript(const QString& script)
 +{
 +    d->script = script;
- }
++}
diff --cc lib/adium-theme-view.cpp
index 96899dd,280e785..df536fb
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@@ -574,7 -563,7 +574,6 @@@ QString AdiumThemeView::replaceMessageK
  
      //messageDirection
      htmlTemplate.replace(QLatin1String("%messageDirection%"), info.messageDirection());
- 
 -    
      htmlTemplate.replace(QLatin1String("%messageClasses%"), info.messageClasses());
  
  

-- 
ktp-text-ui packaging