[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=918e0fc

The following commit has been merged in the master branch:
commit 918e0fcb45a58faace5c5d2a67f776d6a3c8f6f3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Aug 17 23:02:15 2010 +0000

    Fix bug in KDEChatHandler.client introduced when adding support for multiple rooms.
    
    Load the KTelepathy config file for the chat widget.
    
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1164907
---
 app/KDEChatHandler.client |  2 +-
 config/mainwindow.cpp     |  1 +
 lib/chatview.cpp          | 11 ++++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/KDEChatHandler.client b/app/KDEChatHandler.client
index cb2dec8..0b0da88 100644
--- a/app/KDEChatHandler.client
+++ b/app/KDEChatHandler.client
@@ -5,6 +5,6 @@ Interfaces=org.freedesktop.Telepathy.Client.Handler;org.freedesktop.Telepathy.Cl
 org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
 org.freedesktop.Telepathy.Channel.TargetHandleType u=1
 
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
 org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
 org.freedesktop.Telepathy.Channel.TargetHandleType u=2
\ No newline at end of file
diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index a8fe437..ae78fb5 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -136,4 +136,5 @@ void MainWindow::accept()
 
     appearanceConfig.sync();
     config->sync();
+    QDialog::accept();
 }
diff --git a/lib/chatview.cpp b/lib/chatview.cpp
index e720dac..060a356 100644
--- a/lib/chatview.cpp
+++ b/lib/chatview.cpp
@@ -45,18 +45,19 @@ ChatView::ChatView(QWidget *parent) :
     //determine the chat window style to use (from the Kopete config file).
     //FIXME use our own config file. I think we probably want everything from the appearance config group in ours, so it's a simple change.
 
-    KConfig config(KGlobal::dirs()->findResource("config", "kopeterc"));
-    KConfigGroup appearanceConfig = config.group("Appearance");
+    KSharedConfigPtr config = KSharedConfig::openConfig("ktelepathyrc");
+    KConfigGroup appearanceConfig = config->group("Appearance");
 
     QString chatStyleName = appearanceConfig.readEntry("styleName", "Renkoo.AdiumMessageStyle");
-
     m_chatStyle = ChatWindowStyleManager::self()->getValidStyleFromPool(chatStyleName);
 
     if (!m_chatStyle->isValid()) {
-        KMessageBox::error(this, "Failed to load a valid Kopete theme. Note this current version reads chat window settings from your Kopete config file.");
+        KMessageBox::error(this, "Failed to load a valid Kopete theme. Please make sure you run the chat window configuration program first.");
     }
 
-    m_variantPath = appearanceConfig.readEntry("styleVariant");
+    QString variant = appearanceConfig.readEntry("styleVariant");
+    m_variantPath = QString("Variants/%1.css").arg(variant);
+
 
     //special HTML debug mode. Debugging/Profiling only (or theme creating) should have no visible way to turn this flag on.
     m_webInspector = appearanceConfig.readEntry("debug", false);

-- 
ktp-text-ui packaging