[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=45cd75d

The following commit has been merged in the master branch:
commit 45cd75db453b277a1226c9ef258aa6aed2649c1c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 23 02:14:35 2010 +0000

    The chat view was being promoted twice in the .ui file. This is now
    fixed to use the correct header.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1178421
---
 config/chatwindowconfig.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/chatwindowconfig.ui b/config/chatwindowconfig.ui
index 1d80b9e..bd3faf2 100644
--- a/config/chatwindowconfig.ui
+++ b/config/chatwindowconfig.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="ChatView" name="chatView" native="true">
+    <widget class="AdiumThemeView" name="chatView" native="true">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -141,9 +141,9 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
-   <class>ChatView</class>
+   <class>AdiumThemeView</class>
    <extends>QWidget</extends>
-   <header>chatview.h</header>
+   <header>adiumthemeview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

-- 
ktp-text-ui packaging