[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=2445a49

The following commit has been merged in the master branch:
commit 2445a49bf30456d540917db7ecba82afc9c55f8e
Author: Daniel Cohen <analoguecolour at gmail.com>
Date:   Mon Apr 14 19:20:53 2014 +0200

    Fixed chat style example message toggling
---
 config/appearance-config-tab.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index a4d7d6e..f8314d8 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -262,13 +262,6 @@ void AppearanceConfigTab::sendDemoMessages()
         statusMessage.setTime(QDateTime::currentDateTime());
         statusMessage.setStatus(QLatin1String("away"));
         ui->chatView->addAdiumStatusMessage(statusMessage);
-
-        statusMessage = AdiumThemeStatusInfo();
-        statusMessage.setMessage(i18nc("Example message in preview conversations","Ted Example has left the chat.")); //FIXME sync this with chat text logic.
-        statusMessage.setSender(i18nc("Example name", "Ted Example"));
-        statusMessage.setTime(QDateTime::currentDateTime());
-        statusMessage.setStatus(QLatin1String("away"));
-        ui->chatView->addAdiumStatusMessage(statusMessage);
     }
 }
 
@@ -336,5 +329,6 @@ void AppearanceConfigTab::defaultTab()
     ui->fontFamily->setCurrentFont(KGlobalSettings::generalFont());
     ui->fontSize->setValue(QWebSettings::DefaultFontSize);
     ui->showPresenceCheckBox->setChecked(!m_groupChat);
+    ui->showLeaveCheckBox->setChecked(!m_groupChat);
 
 }

-- 
ktp-text-ui packaging