[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=189bd91

The following commit has been merged in the master branch:
commit 189bd91423e7d7a17d6e0b3e4cb400cd40f0b5f7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Mar 13 03:09:07 2012 +0100

    Check that "Contents" is a directory and "Info.plist" is a file
---
 adiumxtra-protocol-handler/chat-style-installer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index 2d5a4e1..5e0cf65 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -59,11 +59,13 @@ BundleInstaller::BundleStatus ChatStyleInstaller::validate()
         if (currentEntry->isDirectory()) {
             currentDir = dynamic_cast<KArchiveDirectory*>(currentEntry);
             if (currentDir) {
-                if (currentDir->entry(QLatin1String("Contents"))) {
+                if (currentDir->entry(QLatin1String("Contents")) &&
+                    currentDir->entry(QLatin1String("Contents"))->isDirectory()) {
                     kDebug() << "Contents found";
                     validResult += 1;
                 }
-                if (currentDir->entry(QLatin1String("Contents/Info.plist"))) {
+                if (currentDir->entry(QLatin1String("Contents/Info.plist")) &&
+                    currentDir->entry(QLatin1String("Contents/Info.plist"))->isFile()) {
                     kDebug() << "Contents/Info.plist found";
                     KArchiveFile const *info = dynamic_cast<KArchiveFile const *>(
                         currentDir->entry(QLatin1String("Contents/Info.plist"))

-- 
ktp-text-ui packaging