Hello community,
here is the log from the commit of package kdeutils4 for openSUSE:Factory
checked in at Mon Jun 21 18:51:15 CEST 2010.
--------
--- KDE/kdeutils4/kdeutils4.changes 2010-05-19 21:04:26.000000000 +0200
+++ kdeutils4/kdeutils4.changes 2010-06-18 17:24:20.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jun 18 17:24:16 CEST 2010 - dmueller@suse.de
+
+- update to 4.4.4
+ * bugfixes over 4.4.3
+ * see http://kde.org/announcements/changelogs/changelog4_4_3to4_4_ 4.php for details
+ * for most modules only version number as a change (4_4_BRANCH.diff already contained the diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdeutils-4.4.3.tar.bz2
New:
----
kdeutils-4.4.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.Z0xwa3/_old 2010-06-21 18:50:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Z0xwa3/_new 2010-06-21 18:50:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 4.4.3)
+# spec file for package kdeutils4 (Version 4.4.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -40,8 +40,8 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 4.4.3
-Release: 3
+Version: 4.4.4
+Release: 1
Source0: kdeutils-%version.tar.bz2
Patch: 4_4_BRANCH.diff
Patch1: desktop-files.diff
++++++ 4_4_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.Z0xwa3/_old 2010-06-21 18:50:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Z0xwa3/_new 2010-06-21 18:50:55.000000000 +0200
@@ -5,309 +5,3 @@
@@ -0,0 +1,2 @@
+current HEAD: 1127686
+svn di between //tags/KDE/4.4.3/kdeutils and //branches/KDE/4.4/kdeutils
---- kgpg/gpgproc.cpp
-+++ kgpg/gpgproc.cpp
-@@ -46,9 +46,12 @@
-
- void GPGProc::start()
- {
-- connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished()));
-- connect(this, SIGNAL(lineReadyStandardOutput()), this, SLOT(received()));
-- KProcess::start();
-+ // make sure there is exactly one connection from us to that signal
-+ disconnect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished()));
-+ disconnect(this, SIGNAL(lineReadyStandardOutput()), this, SLOT(received()));
-+ connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished()));
-+ connect(this, SIGNAL(lineReadyStandardOutput()), this, SLOT(received()));
-+ KProcess::start();
- }
-
- void GPGProc::received()
---- kgpg/keysmanager.cpp
-+++ kgpg/keysmanager.cpp
-@@ -1858,6 +1858,10 @@
-
- void KeysManager::signkey()
- {
-+ // another sign operation is still running
-+ if (!signList.isEmpty())
-+ return;
-+
- KgpgItemType tp;
- QList tmplist = iview->selectedNodes(NULL, &tp);
- if (tmplist.isEmpty())
-@@ -1906,6 +1910,7 @@
- QPointer<KgpgSelectSecretKey> opts = new KgpgSelectSecretKey(this, imodel, signList.count());
- if (opts->exec() != QDialog::Accepted) {
- delete opts;
-+ signList.clear();
- return;
- }
-
-@@ -1928,6 +1933,10 @@
-
- void KeysManager::signuid()
- {
-+ // another sign operation is still running
-+ if (!signList.isEmpty())
-+ return;
-+
- KgpgItemType tp;
- QList tmplist = iview->selectedNodes(NULL, &tp);
- if (tmplist.isEmpty())
-@@ -1985,6 +1994,7 @@
- QPointer<KgpgSelectSecretKey> opts = new KgpgSelectSecretKey(this, imodel, signList.count());
- if (opts->exec() != QDialog::Accepted) {
- delete opts;
-+ signList.clear();
- return;
- }
-
---- kgpg/transactions/kgpgchangepass.cpp
-+++ kgpg/transactions/kgpgchangepass.cpp
-@@ -48,12 +48,19 @@
- if (!line.startsWith(QLatin1String("[GNUPG:] ")))
- return false;
-
-- if (m_seenold && line.contains("keyedit.prompt")) {
-- setSuccess(TS_OK);
-- write("save");
-+ if (line.contains("keyedit.prompt")) {
-+ if (m_seenold && (getSuccess() != TS_USER_ABORTED)) {
-+ setSuccess(TS_OK);
-+ write("save");
-+ } else {
-+ // some sort of error, we already set the error code
-+ return true;
-+ }
- } else if (line.contains("GOOD_PASSPHRASE")) {
- setSuccess(TS_MSG_SEQUENCE);
- m_seenold = true;
-+ } else if (line.contains("MISSING_PASSPHRASE")) {
-+ setSuccess(TS_USER_ABORTED);
- } else if (line.contains("passphrase.enter")) {
- QString userIDs(getIdHints());
-
---- printer-applet/printer-applet.py
-+++ printer-applet/printer-applet.py
-@@ -268,11 +268,11 @@
- refreshAction.setShortcut(QKeySequence(Qt.Key_F5))
- self.connect(refreshAction, SIGNAL("triggered(bool)"), self.on_refresh_activate);
-
-- showCompletedJobsAction = KToggleAction("Show Completed Jobs", self.mainWindow)
-+ showCompletedJobsAction = KToggleAction( i18n( "Show Completed Jobs" ), self.mainWindow)
- self.mainWindow.actionCollection().addAction("show_completed_jobs", showCompletedJobsAction)
- self.connect(showCompletedJobsAction, SIGNAL("triggered(bool)"), self.on_show_completed_jobs_activate);
-
-- showPrinterStatusAction = KToggleAction("Show Printer Status", self.mainWindow)
-+ showPrinterStatusAction = KToggleAction( i18n( "Show Printer Status" ), self.mainWindow)
- self.mainWindow.actionCollection().addAction("show_printer_status", showPrinterStatusAction)
- self.connect(showPrinterStatusAction, SIGNAL("triggered(bool)"), self.on_show_printer_status_activate);
-
---- kdelirc/kcmlirc/kcmlircbase.ui
-+++ kdelirc/kcmlirc/kcmlircbase.ui
-@@ -175,7 +175,7 @@
- </attribute>
- <column>
- <property name="text">
-- <string notr="true">Button</string>
-+ <string>Button</string>
- </property>
- </column>
- <column>
---- ark/app/ark_dndextract.desktop
-+++ ark/app/ark_dndextract.desktop
-@@ -8,7 +8,7 @@
- Name[ca@valencia]=Extracció de l'Ark ací
- Name[cs]=Rozbalit Arkem sem
- Name[da]=Pak ud med Ark her
--Name[de]=Ark - Hierher auspacken
-+Name[de]=Ark – Hierher auspacken
- Name[en_GB]=Ark Extract Here
- Name[es]=Extraer aquí con Ark
- Name[et]=Paki siia lahti
---- ark/plugins/clizipplugin/cliplugin.cpp
-+++ ark/plugins/clizipplugin/cliplugin.cpp
-@@ -39,7 +39,9 @@
- explicit CliPlugin(QObject *parent, const QVariantList & args)
- : CliInterface(parent, args),
- m_status(Header) {
--
-+ // #208091: infozip applies special meanings to some characters
-+ // see match.c in infozip's source code
-+ setEscapedCharacters(QLatin1String("[]*?^-\\!"));
- }
-
- virtual ~CliPlugin() {
---- ark/part/part.cpp
-+++ ark/part/part.cpp
-@@ -146,7 +146,7 @@
- this, SIGNAL(ready()));
- }
-
--void Part::extractSelectedFilesTo(QString localPath)
-+void Part::extractSelectedFilesTo(const QString& localPath)
- {
- kDebug() << "Extract to " << localPath;
- if (!m_model) return;
-@@ -175,7 +175,6 @@
-
- kDebug() << "selected files are " << files;
- Kerfuffle::ExtractionOptions options;
-- options["PreservePaths"] = true;
- if (!internalRoot.isNull()) options["RootNode"] = internalRoot;
-
- ExtractJob *job = m_model->extractFiles(files, localPath, options);
-@@ -484,7 +483,10 @@
- const ArchiveEntry& entry = m_model->entryForIndex(index);
-
- if (!entry.isEmpty()) {
-- ExtractJob *job = m_model->extractFile(entry[ InternalID ], m_previewDir->name());
-+ Kerfuffle::ExtractionOptions options;
-+ options["PreservePaths"] = true;
-+
-+ ExtractJob *job = m_model->extractFile(entry[ InternalID ], m_previewDir->name(), options);
- registerJob(job);
- connect(job, SIGNAL(result(KJob*)),
- this, SLOT(slotPreviewExtracted(KJob*)));
-@@ -495,10 +497,10 @@
- void Part::slotPreviewExtracted(KJob *job)
- {
- if (!job->error()) {
-- //ArkViewer viewer( widget() );
-- const ArchiveEntry& entry = m_model->entryForIndex(m_view->selectionModel()->currentIndex());
-- const QString name = entry[ FileName ].toString().split('/', QString::SkipEmptyParts).last();
-- const QString fullName = m_previewDir->name() + '/' + name;
-+ const ArchiveEntry& entry =
-+ m_model->entryForIndex(m_view->selectionModel()->currentIndex());
-+ const QString fullName =
-+ m_previewDir->name() + '/' + entry[ FileName ].toString();
- ArkViewer::view(fullName, widget());
- } else {
- KMessageBox::error(widget(), job->errorString());
---- ark/part/part.h
-+++ ark/part/part.h
-@@ -59,7 +59,7 @@
- bool isBusy() const;
-
- public slots:
-- void extractSelectedFilesTo(QString localPath);
-+ void extractSelectedFilesTo(const QString& localPath);
-
- private slots:
- void slotLoadingStarted();
---- ark/kerfuffle/cliinterface.cpp
-+++ ark/kerfuffle/cliinterface.cpp
-@@ -208,7 +208,7 @@
- if (argument == "$Files") {
- args.removeAt(i);
- for (int j = 0; j < files.count(); ++j) {
-- args.insert(i + j, files.at(j).toString());
-+ args.insert(i + j, escapeFileName(files.at(j).toString()));
- ++i;
- }
- --i;
-@@ -300,10 +300,7 @@
- if (argument == "$Files") {
- args.removeAt(i);
- for (int j = 0; j < files.count(); ++j) {
--
-- //QString relativeName = QDir::current().relativeFilePath(files.at(j));
--
-- args.insert(i + j, files.at(j).toString());
-+ args.insert(i + j, escapeFileName(files.at(j).toString()));
- ++i;
- }
- --i;
-@@ -659,6 +656,34 @@
- }
- }
- }
-+
-+QString CliInterface::escapedCharacters()
-+{
-+ return m_escapedCharacters;
-+}
-+
-+void CliInterface::setEscapedCharacters(const QString& characters)
-+{
-+ m_escapedCharacters = characters;
-+}
-+
-+QString CliInterface::escapeFileName(const QString& fileName)
-+{
-+ QString quoted;
-+ const int len = fileName.length();
-+ const QLatin1Char backslash('\\');
-+ quoted.reserve(len * 2);
-+
-+ for (int i = 0; i < len; ++i) {
-+ if (m_escapedCharacters.contains(fileName.at(i)))
-+ quoted.append(backslash);
-+
-+ quoted.append(fileName.at(i));
-+ }
-+
-+ return quoted;
-+}
-+
- }
-
- #include "cliinterface.moc"
---- ark/kerfuffle/cliinterface.h
-+++ ark/kerfuffle/cliinterface.h
-@@ -237,6 +237,23 @@
- bool doSuspend();
- bool doResume();
-
-+ /**
-+ * Returns the list of characters which are preceded by a
-+ * backslash when a file name in an archive is passed to
-+ * a program.
-+ *
-+ * @see setEscapedCharacters().
-+ */
-+ QString escapedCharacters();
-+
-+ /**
-+ * Sets which characters will be preceded by a backslash when
-+ * a file name in an archive is passed to a program.
-+ *
-+ * @see escapedCharacters().
-+ */
-+ void setEscapedCharacters(const QString& characters);
-+
- private:
- bool findProgramAndCreateProcess(const QString& program);
- void substituteListVariables(QStringList& params);
-@@ -251,6 +268,14 @@
-
- void failOperation();
-
-+ /**
-+ * Precedes the characters returned by escapedCharacters() with a
-+ * backslash in @p fileName.
-+ *
-+ * @param fileName String to escape.
-+ */
-+ QString escapeFileName(const QString& fileName);
-+
- QByteArray m_stdOutData;
- bool m_userCancelled;
- QRegExp m_existsPattern;
-@@ -260,6 +285,8 @@
- ParameterList m_param;
- QVariantList m_removedFiles;
-
-+ QString m_escapedCharacters;
-+
- private slots:
- void started();
- void readStdout(bool handleAll = false);
-
-Property changes on: .
-___________________________________________________________________
-Added: svn:externals
- +
-
-
++++++ kdeutils-4.4.3.tar.bz2 -> kdeutils-4.4.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/app/ark_dndextract.desktop new/kdeutils-4.4.4/ark/app/ark_dndextract.desktop
--- old/kdeutils-4.4.3/ark/app/ark_dndextract.desktop 2010-04-29 21:59:36.000000000 +0200
+++ new/kdeutils-4.4.4/ark/app/ark_dndextract.desktop 2010-05-28 11:42:32.000000000 +0200
@@ -8,7 +8,7 @@
Name[ca@valencia]=Extracció de l'Ark ací
Name[cs]=Rozbalit Arkem sem
Name[da]=Pak ud med Ark her
-Name[de]=Ark - Hierher auspacken
+Name[de]=Ark – Hierher auspacken
Name[en_GB]=Ark Extract Here
Name[es]=Extraer aquí con Ark
Name[et]=Paki siia lahti
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/kerfuffle/cliinterface.cpp new/kdeutils-4.4.4/ark/kerfuffle/cliinterface.cpp
--- old/kdeutils-4.4.3/ark/kerfuffle/cliinterface.cpp 2010-02-26 19:35:47.000000000 +0100
+++ new/kdeutils-4.4.4/ark/kerfuffle/cliinterface.cpp 2010-05-28 11:42:33.000000000 +0200
@@ -208,7 +208,7 @@
if (argument == "$Files") {
args.removeAt(i);
for (int j = 0; j < files.count(); ++j) {
- args.insert(i + j, files.at(j).toString());
+ args.insert(i + j, escapeFileName(files.at(j).toString()));
++i;
}
--i;
@@ -300,10 +300,7 @@
if (argument == "$Files") {
args.removeAt(i);
for (int j = 0; j < files.count(); ++j) {
-
- //QString relativeName = QDir::current().relativeFilePath(files.at(j));
-
- args.insert(i + j, files.at(j).toString());
+ args.insert(i + j, escapeFileName(files.at(j).toString()));
++i;
}
--i;
@@ -659,6 +656,34 @@
}
}
}
+
+QString CliInterface::escapedCharacters()
+{
+ return m_escapedCharacters;
+}
+
+void CliInterface::setEscapedCharacters(const QString& characters)
+{
+ m_escapedCharacters = characters;
+}
+
+QString CliInterface::escapeFileName(const QString& fileName)
+{
+ QString quoted;
+ const int len = fileName.length();
+ const QLatin1Char backslash('\\');
+ quoted.reserve(len * 2);
+
+ for (int i = 0; i < len; ++i) {
+ if (m_escapedCharacters.contains(fileName.at(i)))
+ quoted.append(backslash);
+
+ quoted.append(fileName.at(i));
+ }
+
+ return quoted;
+}
+
}
#include "cliinterface.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/kerfuffle/cliinterface.h new/kdeutils-4.4.4/ark/kerfuffle/cliinterface.h
--- old/kdeutils-4.4.3/ark/kerfuffle/cliinterface.h 2010-03-26 18:30:42.000000000 +0100
+++ new/kdeutils-4.4.4/ark/kerfuffle/cliinterface.h 2010-05-28 11:42:33.000000000 +0200
@@ -237,6 +237,23 @@
bool doSuspend();
bool doResume();
+ /**
+ * Returns the list of characters which are preceded by a
+ * backslash when a file name in an archive is passed to
+ * a program.
+ *
+ * @see setEscapedCharacters().
+ */
+ QString escapedCharacters();
+
+ /**
+ * Sets which characters will be preceded by a backslash when
+ * a file name in an archive is passed to a program.
+ *
+ * @see escapedCharacters().
+ */
+ void setEscapedCharacters(const QString& characters);
+
private:
bool findProgramAndCreateProcess(const QString& program);
void substituteListVariables(QStringList& params);
@@ -251,6 +268,14 @@
void failOperation();
+ /**
+ * Precedes the characters returned by escapedCharacters() with a
+ * backslash in @p fileName.
+ *
+ * @param fileName String to escape.
+ */
+ QString escapeFileName(const QString& fileName);
+
QByteArray m_stdOutData;
bool m_userCancelled;
QRegExp m_existsPattern;
@@ -260,6 +285,8 @@
ParameterList m_param;
QVariantList m_removedFiles;
+ QString m_escapedCharacters;
+
private slots:
void started();
void readStdout(bool handleAll = false);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/part/part.cpp new/kdeutils-4.4.4/ark/part/part.cpp
--- old/kdeutils-4.4.3/ark/part/part.cpp 2010-02-26 19:35:47.000000000 +0100
+++ new/kdeutils-4.4.4/ark/part/part.cpp 2010-05-28 11:42:33.000000000 +0200
@@ -146,7 +146,7 @@
this, SIGNAL(ready()));
}
-void Part::extractSelectedFilesTo(QString localPath)
+void Part::extractSelectedFilesTo(const QString& localPath)
{
kDebug() << "Extract to " << localPath;
if (!m_model) return;
@@ -484,7 +484,10 @@
const ArchiveEntry& entry = m_model->entryForIndex(index);
if (!entry.isEmpty()) {
- ExtractJob *job = m_model->extractFile(entry[ InternalID ], m_previewDir->name());
+ Kerfuffle::ExtractionOptions options;
+ options["PreservePaths"] = true;
+
+ ExtractJob *job = m_model->extractFile(entry[ InternalID ], m_previewDir->name(), options);
registerJob(job);
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotPreviewExtracted(KJob*)));
@@ -495,10 +498,10 @@
void Part::slotPreviewExtracted(KJob *job)
{
if (!job->error()) {
- //ArkViewer viewer( widget() );
- const ArchiveEntry& entry = m_model->entryForIndex(m_view->selectionModel()->currentIndex());
- const QString name = entry[ FileName ].toString().split('/', QString::SkipEmptyParts).last();
- const QString fullName = m_previewDir->name() + '/' + name;
+ const ArchiveEntry& entry =
+ m_model->entryForIndex(m_view->selectionModel()->currentIndex());
+ const QString fullName =
+ m_previewDir->name() + '/' + entry[ FileName ].toString();
ArkViewer::view(fullName, widget());
} else {
KMessageBox::error(widget(), job->errorString());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/part/part.h new/kdeutils-4.4.4/ark/part/part.h
--- old/kdeutils-4.4.3/ark/part/part.h 2010-02-26 19:35:47.000000000 +0100
+++ new/kdeutils-4.4.4/ark/part/part.h 2010-05-28 11:42:33.000000000 +0200
@@ -59,7 +59,7 @@
bool isBusy() const;
public slots:
- void extractSelectedFilesTo(QString localPath);
+ void extractSelectedFilesTo(const QString& localPath);
private slots:
void slotLoadingStarted();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/plugins/cli7zplugin/cliplugin.cpp new/kdeutils-4.4.4/ark/plugins/cli7zplugin/cliplugin.cpp
--- old/kdeutils-4.4.3/ark/plugins/cli7zplugin/cliplugin.cpp 2009-11-13 11:57:07.000000000 +0100
+++ new/kdeutils-4.4.4/ark/plugins/cli7zplugin/cliplugin.cpp 2010-05-28 11:42:33.000000000 +0200
@@ -33,7 +33,7 @@
CliPlugin::CliPlugin(QObject *parent, const QVariantList & args)
: CliInterface(parent, args)
- , m_state(0)
+ , m_state(ReadStateHeader)
{
}
@@ -75,46 +75,56 @@
bool CliPlugin::readListLine(const QString &line)
{
+ static const QLatin1String archiveInfoDelimiter("----");
+ static const QLatin1String entryInfoDelimiter("----------");
+
switch (m_state) {
- case 0: // header
+ case ReadStateHeader:
if (line.startsWith(QLatin1String("Listing archive:"))) {
- kDebug() << "Archive name: " << line.right(line.size() - 16).trimmed();
- } else if (line.startsWith(QLatin1String("----------"))) {
- m_state = 1;
+ kDebug() << "Archive name: "
+ << line.right(line.size() - 16).trimmed();
+ } else if (line == archiveInfoDelimiter) {
+ m_state = ReadStateArchiveInformation;
} else if (line.contains("Error:")) {
kDebug() << line.mid(6);
- //m_errorMessages << line.mid(6);
}
break;
- case 1: // beginning of a file detail
+
+ case ReadStateArchiveInformation:
+ if (line == entryInfoDelimiter) {
+ m_state = ReadStateEntryInformation;
+ }
+ break;
+
+ case ReadStateEntryInformation:
if (line.startsWith(QLatin1String("Path ="))) {
+ const QString entryFilename =
+ QDir::fromNativeSeparators(line.mid(6).trimmed());
m_currentArchiveEntry.clear();
- QString entryFilename = QDir::fromNativeSeparators(line.mid(6).trimmed());
m_currentArchiveEntry[FileName] = entryFilename;
m_currentArchiveEntry[InternalID] = entryFilename;
- m_state = 2;
- }
- break;
-
- case 2: // file details
- if (line.startsWith(QLatin1String("Size = "))) {
+ } else if (line.startsWith(QLatin1String("Size = "))) {
m_currentArchiveEntry[ Size ] = line.mid(7).trimmed();
} else if (line.startsWith(QLatin1String("Packed Size = "))) {
m_currentArchiveEntry[ CompressedSize ] = line.mid(14).trimmed();
} else if (line.startsWith(QLatin1String("Modified = "))) {
- QDateTime ts = QDateTime::fromString(line.mid(11).trimmed(), "yyyy-MM-dd hh:mm:ss");
- m_currentArchiveEntry[ Timestamp ] = ts;
+ m_currentArchiveEntry[ Timestamp ] =
+ QDateTime::fromString(line.mid(11).trimmed(),
+ "yyyy-MM-dd hh:mm:ss");
} else if (line.startsWith(QLatin1String("Attributes = "))) {
- QString attributes = line.mid(13).trimmed();
+ const QString attributes = line.mid(13).trimmed();
- bool isDirectory = attributes.startsWith('D');
+ const bool isDirectory = attributes.startsWith('D');
m_currentArchiveEntry[ IsDirectory ] = isDirectory;
if (isDirectory) {
- QString directoryName = m_currentArchiveEntry[FileName].toString();
+ const QString directoryName =
+ m_currentArchiveEntry[FileName].toString();
if (!directoryName.endsWith('/')) {
- m_currentArchiveEntry[FileName] = m_currentArchiveEntry[InternalID] = directoryName + '/';
- bool isPasswordProtected = (line.at(12) == '+');
- m_currentArchiveEntry[ IsPasswordProtected ] = isPasswordProtected;
+ const bool isPasswordProtected = (line.at(12) == '+');
+ m_currentArchiveEntry[FileName] =
+ m_currentArchiveEntry[InternalID] = directoryName + '/';
+ m_currentArchiveEntry[ IsPasswordProtected ] =
+ isPasswordProtected;
}
}
@@ -122,22 +132,16 @@
} else if (line.startsWith(QLatin1String("CRC = "))) {
m_currentArchiveEntry[ CRC ] = line.mid(6).trimmed();
} else if (line.startsWith(QLatin1String("Method = "))) {
- QString method = line.mid(9).trimmed();
- m_currentArchiveEntry[ Method ] = method;
- } else if (line.startsWith(QLatin1String("Encrypted = ")) && line.size() >= 13) {
- bool isPasswordProtected = (line.at(12) == '+');
- m_currentArchiveEntry[ IsPasswordProtected ] = isPasswordProtected;
+ m_currentArchiveEntry[ Method ] = line.mid(9).trimmed();
+ } else if (line.startsWith(QLatin1String("Encrypted = ")) &&
+ line.size() >= 13) {
+ m_currentArchiveEntry[ IsPasswordProtected ] = (line.at(12) == '+');
} else if (line.startsWith(QLatin1String("Block = "))) {
if (m_currentArchiveEntry.contains(FileName)) {
entry(m_currentArchiveEntry);
}
-
- m_state = 1;
}
break;
-
- default:
- break;
}
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/plugins/cli7zplugin/cliplugin.h new/kdeutils-4.4.4/ark/plugins/cli7zplugin/cliplugin.h
--- old/kdeutils-4.4.3/ark/plugins/cli7zplugin/cliplugin.h 2009-11-13 11:57:07.000000000 +0100
+++ new/kdeutils-4.4.4/ark/plugins/cli7zplugin/cliplugin.h 2010-05-28 11:42:33.000000000 +0200
@@ -39,8 +39,14 @@
virtual bool readListLine(const QString &line);
private:
+ enum ReadState {
+ ReadStateHeader = 0,
+ ReadStateArchiveInformation,
+ ReadStateEntryInformation
+ };
+
Kerfuffle::ArchiveEntry m_currentArchiveEntry;
- int m_state;
+ ReadState m_state;
};
#endif // CLIPLUGIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/ark/plugins/clizipplugin/cliplugin.cpp new/kdeutils-4.4.4/ark/plugins/clizipplugin/cliplugin.cpp
--- old/kdeutils-4.4.3/ark/plugins/clizipplugin/cliplugin.cpp 2010-01-20 00:25:27.000000000 +0100
+++ new/kdeutils-4.4.4/ark/plugins/clizipplugin/cliplugin.cpp 2010-05-28 11:42:33.000000000 +0200
@@ -39,7 +39,9 @@
explicit CliPlugin(QObject *parent, const QVariantList & args)
: CliInterface(parent, args),
m_status(Header) {
-
+ // #208091: infozip applies special meanings to some characters
+ // see match.c in infozip's source code
+ setEscapedCharacters(QLatin1String("[]*?^-\\!"));
}
virtual ~CliPlugin() {
Files old/kdeutils-4.4.3/doc/ark/index.cache.bz2 and new/kdeutils-4.4.4/doc/ark/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kcalc/index.cache.bz2 and new/kdeutils-4.4.4/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kcharselect/index.cache.bz2 and new/kdeutils-4.4.4/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kcontrol/blockdevices/index.cache.bz2 and new/kdeutils-4.4.4/doc/kcontrol/blockdevices/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kdelirc/irkick/index.cache.bz2 and new/kdeutils-4.4.4/doc/kdelirc/irkick/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kdelirc/kcmlirc/index.cache.bz2 and new/kdeutils-4.4.4/doc/kdelirc/kcmlirc/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kdf/index.cache.bz2 and new/kdeutils-4.4.4/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kfloppy/index.cache.bz2 and new/kdeutils-4.4.4/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kgpg/index.cache.bz2 and new/kdeutils-4.4.4/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/ktimer/index.cache.bz2 and new/kdeutils-4.4.4/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/kwallet/index.cache.bz2 and new/kdeutils-4.4.4/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/okteta/index.cache.bz2 and new/kdeutils-4.4.4/doc/okteta/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/printer-applet/index.cache.bz2 and new/kdeutils-4.4.4/doc/printer-applet/index.cache.bz2 differ
Files old/kdeutils-4.4.3/doc/superkaramba/index.cache.bz2 and new/kdeutils-4.4.4/doc/superkaramba/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/kdelirc/kcmlirc/kcmlircbase.ui new/kdeutils-4.4.4/kdelirc/kcmlirc/kcmlircbase.ui
--- old/kdeutils-4.4.3/kdelirc/kcmlirc/kcmlircbase.ui 2009-11-21 10:43:34.000000000 +0100
+++ new/kdeutils-4.4.4/kdelirc/kcmlirc/kcmlircbase.ui 2010-05-28 11:42:32.000000000 +0200
@@ -175,7 +175,7 @@
</attribute>
<column>
<property name="text">
- <string notr="true">Button</string>
+ <string>Button</string>
</property>
</column>
<column>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/kfloppy/floppy_format.desktop new/kdeutils-4.4.4/kfloppy/floppy_format.desktop
--- old/kdeutils-4.4.3/kfloppy/floppy_format.desktop 2010-01-20 00:25:23.000000000 +0100
+++ new/kdeutils-4.4.4/kfloppy/floppy_format.desktop 2010-05-28 11:42:32.000000000 +0200
@@ -56,7 +56,7 @@
Name[ta]=வடிவமைப்பு
Name[th]=ฟอร์แมต
Name[tr]=Biçimlendir
-Name[uk]=Форматування
+Name[uk]=Форматувати
Name[uz]=Formatlash
Name[uz@cyrillic]=Форматлаш
Name[vi]=Định Dạng Đĩa Mềm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/kgpg/gpgproc.cpp new/kdeutils-4.4.4/kgpg/gpgproc.cpp
--- old/kdeutils-4.4.3/kgpg/gpgproc.cpp 2009-12-17 17:38:07.000000000 +0100
+++ new/kdeutils-4.4.4/kgpg/gpgproc.cpp 2010-05-28 11:42:32.000000000 +0200
@@ -46,9 +46,12 @@
void GPGProc::start()
{
- connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished()));
- connect(this, SIGNAL(lineReadyStandardOutput()), this, SLOT(received()));
- KProcess::start();
+ // make sure there is exactly one connection from us to that signal
+ disconnect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished()));
+ disconnect(this, SIGNAL(lineReadyStandardOutput()), this, SLOT(received()));
+ connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished()));
+ connect(this, SIGNAL(lineReadyStandardOutput()), this, SLOT(received()));
+ KProcess::start();
}
void GPGProc::received()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/kgpg/keysmanager.cpp new/kdeutils-4.4.4/kgpg/keysmanager.cpp
--- old/kdeutils-4.4.3/kgpg/keysmanager.cpp 2010-03-26 18:30:42.000000000 +0100
+++ new/kdeutils-4.4.4/kgpg/keysmanager.cpp 2010-05-28 11:42:32.000000000 +0200
@@ -28,7 +28,6 @@
#include <QWidget>
#include <QLabel>
#include <QEvent>
-#include <QMovie>
#include <QList>
#include <QFile>
#include <QDir>
@@ -1280,6 +1279,12 @@
{
KGpgKeyNode *ndef = imodel->getRootNode()->findKey(newID);
+ if (ndef == NULL) {
+ KGpgSettings::setDefaultKey(newID);
+ KGpgSettings::self()->writeConfig();
+ return;
+ }
+
setDefaultKeyNode(ndef);
}
@@ -1858,6 +1863,10 @@
void KeysManager::signkey()
{
+ // another sign operation is still running
+ if (!signList.isEmpty())
+ return;
+
KgpgItemType tp;
QList tmplist = iview->selectedNodes(NULL, &tp);
if (tmplist.isEmpty())
@@ -1906,6 +1915,7 @@
QPointer<KgpgSelectSecretKey> opts = new KgpgSelectSecretKey(this, imodel, signList.count());
if (opts->exec() != QDialog::Accepted) {
delete opts;
+ signList.clear();
return;
}
@@ -1928,6 +1938,10 @@
void KeysManager::signuid()
{
+ // another sign operation is still running
+ if (!signList.isEmpty())
+ return;
+
KgpgItemType tp;
QList tmplist = iview->selectedNodes(NULL, &tp);
if (tmplist.isEmpty())
@@ -1985,6 +1999,7 @@
QPointer<KgpgSelectSecretKey> opts = new KgpgSelectSecretKey(this, imodel, signList.count());
if (opts->exec() != QDialog::Accepted) {
delete opts;
+ signList.clear();
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/kgpg/transactions/kgpgchangepass.cpp new/kdeutils-4.4.4/kgpg/transactions/kgpgchangepass.cpp
--- old/kdeutils-4.4.3/kgpg/transactions/kgpgchangepass.cpp 2009-12-17 17:38:07.000000000 +0100
+++ new/kdeutils-4.4.4/kgpg/transactions/kgpgchangepass.cpp 2010-05-28 11:42:32.000000000 +0200
@@ -48,12 +48,19 @@
if (!line.startsWith(QLatin1String("[GNUPG:] ")))
return false;
- if (m_seenold && line.contains("keyedit.prompt")) {
- setSuccess(TS_OK);
- write("save");
+ if (line.contains("keyedit.prompt")) {
+ if (m_seenold && (getSuccess() != TS_USER_ABORTED)) {
+ setSuccess(TS_OK);
+ write("save");
+ } else {
+ // some sort of error, we already set the error code
+ return true;
+ }
} else if (line.contains("GOOD_PASSPHRASE")) {
setSuccess(TS_MSG_SEQUENCE);
m_seenold = true;
+ } else if (line.contains("MISSING_PASSPHRASE")) {
+ setSuccess(TS_USER_ABORTED);
} else if (line.contains("passphrase.enter")) {
QString userIDs(getIdHints());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.4.3/printer-applet/printer-applet.py new/kdeutils-4.4.4/printer-applet/printer-applet.py
--- old/kdeutils-4.4.3/printer-applet/printer-applet.py 2010-01-31 20:34:24.000000000 +0100
+++ new/kdeutils-4.4.4/printer-applet/printer-applet.py 2010-05-28 11:42:32.000000000 +0200
@@ -268,11 +268,11 @@
refreshAction.setShortcut(QKeySequence(Qt.Key_F5))
self.connect(refreshAction, SIGNAL("triggered(bool)"), self.on_refresh_activate);
- showCompletedJobsAction = KToggleAction("Show Completed Jobs", self.mainWindow)
+ showCompletedJobsAction = KToggleAction( i18n( "Show Completed Jobs" ), self.mainWindow)
self.mainWindow.actionCollection().addAction("show_completed_jobs", showCompletedJobsAction)
self.connect(showCompletedJobsAction, SIGNAL("triggered(bool)"), self.on_show_completed_jobs_activate);
- showPrinterStatusAction = KToggleAction("Show Printer Status", self.mainWindow)
+ showPrinterStatusAction = KToggleAction( i18n( "Show Printer Status" ), self.mainWindow)
self.mainWindow.actionCollection().addAction("show_printer_status", showPrinterStatusAction)
self.connect(showPrinterStatusAction, SIGNAL("triggered(bool)"), self.on_show_printer_status_activate);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org