[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=8bc0712

The following commit has been merged in the master branch:
commit 8bc0712cbb3647971ce1051c28b6e796a00a49b0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Sep 21 19:10:59 2010 +0000

    Remove superfloud .data() call when comparing SharedPtr
    Use the installed default style.
    
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177949
---
 lib/chatwindow.cpp             | 2 +-
 lib/chatwindowstylemanager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index 8e27e08..160f959 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -123,7 +123,7 @@ void ChatWindow::sendMessage()
 void ChatWindow::updateChatStatus(Tp::ContactPtr contact, ChannelChatState state)
 {
     //don't show our own status changes.
-    if (contact.data() == m_chatConnection->connection()->selfContact())
+    if (contact == m_chatConnection->connection()->selfContact())
     {
         return;
     }
diff --git a/lib/chatwindowstylemanager.cpp b/lib/chatwindowstylemanager.cpp
index 9ee776b..d6b8723 100644
--- a/lib/chatwindowstylemanager.cpp
+++ b/lib/chatwindowstylemanager.cpp
@@ -290,7 +290,7 @@ ChatWindowStyle *ChatWindowStyleManager::getValidStyleFromPool(const QString &st
 
     kDebug() << "Trying default style";
     // Try default style
-    style = getStyleFromPool("Kopete");
+    style = getStyleFromPool("renkoo.AdiumMessageStyle");
     if (style)
         return style;
 

-- 
ktp-text-ui packaging