[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/kdewin-installer/shared
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2010-07-31 21:34:31
Message-ID: 20100731213431.41B03AC783 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157694 by habacker:

limited sending of unpackager error only when really unpacking

 M  +4 -2      installer.cpp  


--- trunk/kdesupport/kdewin-installer/shared/installer.cpp #1157693:1157694
@@ -49,7 +49,6 @@
         : QObject(parent), m_type(Installer::Standard)
 {
     m_root = ".";
-    connect(Unpacker::instance(),SIGNAL(error(const QString \
&)),this,SLOT(slotError(const QString &)));  }
 
 Installer::~Installer()
@@ -175,7 +174,10 @@
         m_files = QStringList() << pkg->localFilePath(type);
     }
     else {
-        if (!Unpacker::instance()->unpackFile(pkg->localFilePath(type), m_root, \
pkg->pathRelocations())) +        connect(Unpacker::instance(),SIGNAL(error(const \
QString &)),this,SLOT(slotError(const QString &))); +        bool ret = \
Unpacker::instance()->unpackFile(pkg->localFilePath(type), m_root, \
pkg->pathRelocations()); +        disconnect(Unpacker::instance(),SIGNAL(error(const \
QString &)),this,SLOT(slotError(const QString &))); +        if (!ret)
             return false;
         m_files = Unpacker::instance()->unpackedFiles();
     }


[prev in list] [next in list] [prev in thread] [next in thread]