[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=554ba0f

The following commit has been merged in the master branch:
commit 554ba0f5e2bdac8e8780ea5ebe8e1e550567d3f4
Author: Dominik Schmidt <ich at dominik-schmidt.de>
Date:   Sat Sep 18 22:28:44 2010 +0000

    Fix loading styles by adding fallbacks for missing templates.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1176858
---
 app/.swp.mainwindow.cpp | Bin 0 -> 6327 bytes
 lib/chatwindowstyle.cpp |  28 ++++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/.swp.mainwindow.cpp b/app/.swp.mainwindow.cpp
new file mode 100644
index 0000000..afebced
Binary files /dev/null and b/app/.swp.mainwindow.cpp differ
diff --git a/lib/chatwindowstyle.cpp b/lib/chatwindowstyle.cpp
index 6c523c9..bbdc961 100644
--- a/lib/chatwindowstyle.cpp
+++ b/lib/chatwindowstyle.cpp
@@ -97,8 +97,16 @@ ChatWindowStyle::~ChatWindowStyle()
 
 bool ChatWindowStyle::isValid() const
 {
-    return (!d->statusHtml.isEmpty() && !d->fileTransferIncomingHtml.isEmpty() && !d->nextIncomingHtml.isEmpty()
-            && !d->incomingHtml.isEmpty() && !d->nextOutgoingHtml.isEmpty() && !d->outgoingHtml.isEmpty());
+    kDebug();
+    bool statusHtml = !d->statusHtml.isEmpty();
+    bool fileTransferIncomingHtml = !d->fileTransferIncomingHtml.isEmpty();
+    bool nextIncomingHtml = !d->nextIncomingHtml.isEmpty();
+    bool incomingHtml = !d->incomingHtml.isEmpty();
+    bool nextOutgoingHtml = !d->nextOutgoingHtml.isEmpty();
+    bool outgoingHtml = !d->outgoingHtml.isEmpty();
+
+    return (statusHtml && fileTransferIncomingHtml && nextIncomingHtml
+            && incomingHtml && nextOutgoingHtml  && outgoingHtml);
 }
 
 ChatWindowStyle::StyleVariants ChatWindowStyle::getVariants()
@@ -290,6 +298,12 @@ void ChatWindowStyle::readStyleFiles()
         d->nextIncomingHtml = headerStream.readAll();
         fileAccess.close();
     }
+
+    if(d->nextIncomingHtml.isEmpty()) {
+      d->nextIncomingHtml = d->incomingHtml;
+    }
+
+
     // Load outgoing file
     if (QFile::exists(outgoingFile)) {
         fileAccess.setFileName(outgoingFile);
@@ -299,6 +313,11 @@ void ChatWindowStyle::readStyleFiles()
         d->outgoingHtml = headerStream.readAll();
         fileAccess.close();
     }
+
+    if(d->outgoingHtml.isEmpty()) {
+      d->outgoingHtml = d->incomingHtml;
+    }
+
     // Load next outgoing file
     if (QFile::exists(nextOutgoingFile)) {
         fileAccess.setFileName(nextOutgoingFile);
@@ -308,6 +327,11 @@ void ChatWindowStyle::readStyleFiles()
         d->nextOutgoingHtml = headerStream.readAll();
         fileAccess.close();
     }
+
+    if(d->nextOutgoingHtml.isEmpty()) {
+      d->nextOutgoingHtml = d->outgoingHtml;
+    }
+
     // Load status file
     if (QFile::exists(statusFile)) {
         fileAccess.setFileName(statusFile);

-- 
ktp-text-ui packaging