[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=bf69d48

The following commit has been merged in the master branch:
commit bf69d48342d699446da37f514ce96c2c18bca001
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Mar 13 02:53:58 2012 +0100

    Do not fail installing on optional files
    
    See http://trac.adium.im/wiki/CreatingMessageStyles
---
 lib/chat-window-style-manager.cpp | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index 235fc53..985b8cc 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -190,44 +190,12 @@ int ChatWindowStyleManager::installStyle(const QString &styleBundlePath)
                   kDebug() << "Contents/Resources found";
                    validResult += 1;
                }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Incoming"))) {
-                  kDebug() << "Contents/Resources/Incoming found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Outgoing"))) {
-                  kDebug() << "Contents/Resources/Outgoing found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/main.css"))) {
-                  kDebug() << "Contents/Resources/main.css found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Footer.html"))) {
-                  kDebug() << "Contents/Resources/Footer.html found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Status.html"))) {
-                  kDebug() << "Contents/Resources/Status.html found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Header.html"))) {
-                  kDebug() << "Contents/Resources/Header.html found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Incoming/Content.html"))) {
-                  kDebug() << "Contents/Resources/Incoming/Content.html found";
-                   validResult += 1;
-               }
-               if (currentDir->entry(QLatin1String("Contents/Resources/Outgoing/Content.html"))) {
-                  kDebug() << "Contents/Resources/Outgoing/Content.html found";
-                   validResult += 1;
-               }
            }
        }
    }
   kDebug() << "Valid result: " << QString::number(validResult);
    // The archive is a valid style bundle.
-   if (validResult >= 8) {
+   if (validResult >= 2) {
        bool installOk = false;
        for (entriesIt = entries.begin(); entriesIt != entries.end(); ++entriesIt) {
            currentEntry = const_cast<KArchiveEntry*>(rootDir->entry(*entriesIt));

-- 
ktp-text-ui packaging