Hello community,

here is the log from the commit of package kdeutils4 for openSUSE:Factory
checked in at Thu Mar 10 12:38:36 CET 2011.



--------
--- KDE/kdeutils4/kdeutils4.changes     2011-01-25 14:35:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes    2011-03-08 
14:10:43.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Mar  8 14:10:42 CET 2011 - [email protected]
+
+- update to 4.6.1
+  * Bugfixes over KDE 4.6.0
+  *  see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for 
details
+  
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  kdeutils-4.6.0.tar.bz2

New:
----
  kdeutils-4.6.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.vVcoRd/_old  2011-03-10 12:37:34.000000000 +0100
+++ /var/tmp/diff_new_pack.vVcoRd/_new  2011-03-10 12:37:34.000000000 +0100
@@ -30,7 +30,7 @@
 Group:          Productivity/Other
 Summary:        Base Package of KDE Utility Programs
 Url:            http://www.kde.org
-Version:        4.6.0
+Version:        4.6.1
 Release:        1
 BuildRequires:  gmp-devel kdebase4-workspace-devel >= %version 
libqimageblitz-devel net-snmp-devel pcsc-lite python-devel
 BuildRequires:  libkdepimlibs4-devel libkonq-devel libqca2-devel libzip-devel 
oxygen-icon-theme-large

++++++ kdeutils-4.6.0.tar.bz2 -> kdeutils-4.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/ark/part/part.cpp 
new/kdeutils-4.6.1/ark/part/part.cpp
--- old/kdeutils-4.6.0/ark/part/part.cpp        2011-01-18 22:25:04.000000000 
+0100
+++ new/kdeutils-4.6.1/ark/part/part.cpp        2011-02-25 22:47:49.000000000 
+0100
@@ -784,7 +784,14 @@
 {
     kDebug();
 
-    const int reallyDelete = KMessageBox::questionYesNo(NULL, i18n("Deleting 
these files is not undoable. Are you sure you want to do this?"), 
i18nc("@title:window", "Delete files") , KStandardGuiItem::del(), 
KStandardGuiItem::cancel());
+    const int reallyDelete =
+        KMessageBox::questionYesNo(NULL,
+                                   i18n("Deleting these files is not undoable. 
Are you sure you want to do this?"),
+                                   i18nc("@title:window", "Delete files"),
+                                   KStandardGuiItem::del(),
+                                   KStandardGuiItem::cancel(),
+                                   QString(),
+                                   KMessageBox::Dangerous | 
KMessageBox::Notify);
 
     if (reallyDelete == KMessageBox::No) {
         return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdeutils-4.6.0/ark/plugins/clirarplugin/cliplugin.cpp 
new/kdeutils-4.6.1/ark/plugins/clirarplugin/cliplugin.cpp
--- old/kdeutils-4.6.0/ark/plugins/clirarplugin/cliplugin.cpp   2011-01-18 
22:25:03.000000000 +0100
+++ new/kdeutils-4.6.1/ark/plugins/clirarplugin/cliplugin.cpp   2011-02-25 
22:47:49.000000000 +0100
@@ -78,7 +78,7 @@
 
         p[AddArgs] = QStringList() << QLatin1String( "a" ) << QLatin1String( 
"$Archive" ) << QLatin1String( "$Files" );
 
-        p[WrongPasswordPatterns] = QStringList() << QLatin1String( "password 
incorrect" );
+        p[WrongPasswordPatterns] = QStringList() << QLatin1String("password 
incorrect") << QLatin1String("wrong password");
         p[ExtractionFailedPatterns] = QStringList() << QLatin1String( "CRC 
failed" ) << QLatin1String( "Cannot find volume" );
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdeutils-4.6.0/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop 
new/kdeutils-4.6.1/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop
--- 
old/kdeutils-4.6.0/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop 
    2011-01-19 22:57:59.000000000 +0100
+++ 
new/kdeutils-4.6.1/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop 
    2011-02-25 22:47:49.000000000 +0100
@@ -19,6 +19,8 @@
 Name[en_GB]=kerfuffle_libarchive_readonly
 Name[es]=kerfuffle_libarchive_readonly
 Name[et]=kerfuffle_libarchive_readonly
+Name[eu]=kerfuffle_libarchive_readonly
+Name[fi]=kerfuffle_libarchive_readonly
 Name[fr]=kerfuffle_libarchive_readonly
 Name[hu]=kerfuffle_libarchive_readonly
 Name[it]=kerfuffle_libarchive_readonly
@@ -40,6 +42,7 @@
 Name[sr@latin]=kerfuffle_libarchive_readonly
 Name[sv]=Kerfuffle Libarchive skrivskyddat
 Name[th]=kerfuffle_libarchive_readonly
+Name[tr]=kerfuffle_libarchive_readonly
 Name[uk]=kerfuffle_libarchive_readonly
 Name[wa]=kerfuffle_libarchive_readonly
 Name[x-test]=xxkerfuffle_libarchive_readonlyxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdeutils-4.6.0/ark/plugins/libarchive/libarchivehandler.cpp 
new/kdeutils-4.6.1/ark/plugins/libarchive/libarchivehandler.cpp
--- old/kdeutils-4.6.0/ark/plugins/libarchive/libarchivehandler.cpp     
2011-01-18 22:25:03.000000000 +0100
+++ new/kdeutils-4.6.1/ark/plugins/libarchive/libarchivehandler.cpp     
2011-02-25 22:47:49.000000000 +0100
@@ -192,7 +192,11 @@
     bool skipAll = false; // Whether to skip all files
     struct archive_entry *entry;
 
+    QString fileBeingRenamed;
+
     while (archive_read_next_header(arch.data(), &entry) == ARCHIVE_OK) {
+        fileBeingRenamed.clear();
+
         // retry with renamed entry, fire an overwrite query again
         // if the new entry also exists
     retry:
@@ -215,13 +219,13 @@
             return false;
         }
 
-        if (files.contains(entryName) || extractAll) {
+        if (files.contains(entryName) || entryName == fileBeingRenamed || 
extractAll) {
             // entryFI is the fileinfo pointing to where the file will be
             // written from the archive
             QFileInfo entryFI(entryName);
             //kDebug() << "setting path to " << archive_entry_pathname( entry 
);
 
-            QString fileWithoutPath = entryFI.fileName();
+            const QString fileWithoutPath(entryFI.fileName());
 
             //if we DON'T preserve paths, we cut the path and set the entryFI
             //fileinfo to the one without the path
@@ -236,9 +240,9 @@
                 //OR, if the commonBase has been set, then we remove this
                 //common base from the filename
             } else if (!rootNode.isEmpty()) {
-                QString truncatedFilename;
-                truncatedFilename = entryName.remove(0, rootNode.size());
+                const QString truncatedFilename(entryName.remove(0, 
rootNode.size()));
                 kDebug() << "Truncated filename: " << truncatedFilename;
+
                 archive_entry_copy_pathname(entry, 
QFile::encodeName(truncatedFilename).constData());
 
                 entryFI = QFileInfo(truncatedFilename);
@@ -269,7 +273,8 @@
                         skipAll = true;
                         continue;
                     } else if (query.responseRename()) {
-                        QString newName = query.newFilename();
+                        const QString newName(query.newFilename());
+                        fileBeingRenamed = newName;
                         archive_entry_copy_pathname(entry, 
QFile::encodeName(newName).constData());
                         goto retry;
                     } else if (query.responseOverwriteAll()) {
Files old/kdeutils-4.6.0/doc/ark/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/ark/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/filelight/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/filelight/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kcalc/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kcharselect/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kcontrol/blockdevices/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kcontrol/blockdevices/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kcontrol/kremotecontrol/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kcontrol/kremotecontrol/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kdf/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kfloppy/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kgpg/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/ktimer/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/kwallet/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-4.6.0/doc/sweeper/index.cache.bz2 and 
new/kdeutils-4.6.1/doc/sweeper/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/filelight/Mainpage.dox 
new/kdeutils-4.6.1/filelight/Mainpage.dox
--- old/kdeutils-4.6.0/filelight/Mainpage.dox   1970-01-01 01:00:00.000000000 
+0100
+++ new/kdeutils-4.6.1/filelight/Mainpage.dox   2011-02-25 22:47:49.000000000 
+0100
@@ -0,0 +1,8 @@
+/** @mainpage Filelight
+
+The Filelight application
+
+*/
+
+// DOXYGEN_REFERENCES = kdecore
+// DOXYGEN_SET_PROJECT_NAME = filelight
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/filelight/misc/filelight.desktop 
new/kdeutils-4.6.1/filelight/misc/filelight.desktop
--- old/kdeutils-4.6.0/filelight/misc/filelight.desktop 2011-01-18 
22:24:59.000000000 +0100
+++ new/kdeutils-4.6.1/filelight/misc/filelight.desktop 2011-02-25 
22:47:49.000000000 +0100
@@ -3,12 +3,14 @@
 Name=Filelight
 Name[ca]=Filelight
 Name[ca@valencia]=Filelight
+Name[cs]=Filelight
 Name[da]=Filelight
 Name[de]=Filelight
 Name[en_GB]=Filelight
 Name[es]=Filelight
 Name[et]=Filelight
 Name[eu]=Filelight
+Name[fi]=Filelight
 Name[fr]=Filelight
 Name[it]=Filelight
 Name[kk]=Filelight
@@ -39,6 +41,7 @@
 GenericName[ast]=Estadístiques d'usu de discu
 GenericName[ca]=Estadístiques d'ús de disc
 GenericName[ca@valencia]=Estadístiques d'ús de disc
+GenericName[cs]=Statistika použití disku
 GenericName[da]=Statistik over diskforbrug
 GenericName[de]=Statistiken über Festplattenbelegung
 GenericName[en_GB]=Disk Usage Statistics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/filelight/src/part/localLister.cpp 
new/kdeutils-4.6.1/filelight/src/part/localLister.cpp
--- old/kdeutils-4.6.0/filelight/src/part/localLister.cpp       2011-01-18 
22:24:59.000000000 +0100
+++ new/kdeutils-4.6.1/filelight/src/part/localLister.cpp       2011-02-25 
22:47:49.000000000 +0100
@@ -38,7 +38,7 @@
 #include <dirent.h>
 #ifdef Q_OS_SOLARIS
 #include <sys/vfstab.h>
-#else
+#elif !defined(Q_WS_WIN)
 #include <fstab.h>
 #endif
 #include <sys/stat.h>
@@ -125,8 +125,10 @@
         out("Bad file descriptor");
     case EFAULT:
         out("Bad address");
+#ifndef Q_WS_WIN
     case ELOOP: //NOTE shouldn't ever happen
         out("Too many symbolic links encountered while traversing the path");
+#endif
     case ENAMETOOLONG:
         out("File name too long");
     }
@@ -145,6 +147,14 @@
         return cwd;
     }
 
+#ifdef _MSC_VER
+//use a wider struct on win for nice handling of files larger than 2 GB
+#undef KDE_struct_stat
+#undef KDE_lstat
+#define KDE_struct_stat struct _stat64
+#define KDE_lstat kdewin32_stat64
+#endif
+
     KDE_struct_stat statbuf;
     dirent *ent;
     while ((ent = KDE_readdir(dir)))
@@ -175,7 +185,11 @@
 
         if (S_ISREG(statbuf.st_mode)) //file
             //using units of KiB as 32bit max is 4GiB and 64bit ints are 
expensive
+#ifndef Q_WS_WIN
             cwd->append(ent->d_name, (statbuf.st_blocks * S_BLKSIZE) / 1024);
+#else
+            cwd->append(ent->d_name, statbuf.st_size / 1024);
+#endif
 
         else if (S_ISDIR(statbuf.st_mode)) //folder
         {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/filelight/src/part/part.cpp 
new/kdeutils-4.6.1/filelight/src/part/part.cpp
--- old/kdeutils-4.6.0/filelight/src/part/part.cpp      2011-01-18 
22:24:59.000000000 +0100
+++ new/kdeutils-4.6.1/filelight/src/part/part.cpp      2011-02-25 
22:47:49.000000000 +0100
@@ -42,6 +42,7 @@
 #include <QtCore/QFile>        //encodeName()
 #include <QtCore/QTimer>       //postInit() hack
 #include <QtCore/QByteArray>
+#include <QtCore/QDir>
 
 #include <unistd.h>       //access()
 #include <iostream>
@@ -159,7 +160,7 @@
     {
         KMSG(i18n("The entered URL cannot be parsed; it is invalid."));
     }
-    else if (path[0] != QLatin1Char( '/' ))
+    else if ((!isLocal && path[0] != QLatin1Char( '/' )) || (isLocal && 
!QDir::isAbsolutePath(path)))
     {
         KMSG(i18n("Filelight only accepts absolute paths, eg. /%1", path));
     }
@@ -167,7 +168,7 @@
     {
         KMSG(i18n("Folder not found: %1", path));
     }
-    else if (isLocal && access(path8bit, R_OK | X_OK) != 0)
+    else if (isLocal && !QDir(path).isReadable()) //access(path8bit, R_OK | 
X_OK) != 0 doesn't work on win32
     {
         KMSG(i18n("Unable to enter: %1\nYou do not have access rights to this 
location.", path));
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/editor/kgpgeditor.cpp 
new/kdeutils-4.6.1/kgpg/editor/kgpgeditor.cpp
--- old/kdeutils-4.6.0/kgpg/editor/kgpgeditor.cpp       2011-01-18 
22:24:55.000000000 +0100
+++ new/kdeutils-4.6.1/kgpg/editor/kgpgeditor.cpp       2011-02-25 
22:47:49.000000000 +0100
@@ -473,7 +473,6 @@
 
 void KgpgEditor::slotFilePreEnc()
 {
-    QStringList opts;
     KUrl::List urls = KFileDialog::getOpenUrls(KUrl(), i18n("*|All Files"), 
this, i18n("Open File to Encode"));
     if (urls.isEmpty())
         return;
@@ -490,10 +489,10 @@
     QString newname;
 
     if (oldname.endsWith(QLatin1String(".gpg")) || 
oldname.endsWith(QLatin1String(".asc")) || 
oldname.endsWith(QLatin1String(".pgp")))
-        oldname.truncate(oldname.length() - 4);
+        oldname.chop(4);
     else
         oldname.append(QLatin1String( ".clear" ));
-    oldname.prepend(url.directory(KUrl::IgnoreTrailingSlash));
+    oldname.prepend(url.directory(KUrl::AppendTrailingSlash));
 
     KDialog *popn = new KDialog(this );
     popn->setCaption(  i18n("Decrypt File To") );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/editor/kgpgtextedit.cpp 
new/kdeutils-4.6.1/kgpg/editor/kgpgtextedit.cpp
--- old/kdeutils-4.6.0/kgpg/editor/kgpgtextedit.cpp     2011-01-18 
22:24:55.000000000 +0100
+++ new/kdeutils-4.6.1/kgpg/editor/kgpgtextedit.cpp     2011-02-25 
22:47:49.000000000 +0100
@@ -249,7 +249,7 @@
 #ifdef __GNUC__
 #warning FIXME choose codec
 #endif
-               setPlainText(decr->decryptedText().join( QLatin1String( "\n" 
)));
+               setPlainText(decr->decryptedText().join(QLatin1String("\n")) + 
QLatin1Char('\n'));
        } else if (result != KGpgTransaction::TS_USER_ABORTED) {
                KMessageBox::detailedSorry(this, i18n("Decryption failed."), 
decr->getMessages().join( QLatin1String( "\n" )));
        }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/keysmanager.cpp 
new/kdeutils-4.6.1/kgpg/keysmanager.cpp
--- old/kdeutils-4.6.0/kgpg/keysmanager.cpp     2011-01-18 22:24:55.000000000 
+0100
+++ new/kdeutils-4.6.1/kgpg/keysmanager.cpp     2011-02-25 22:47:49.000000000 
+0100
@@ -485,8 +485,8 @@
        iproxy->setOnlySecret(KGpgSettings::showSecret());
 
        KStatusBar *statusbar = statusBar();
-       statusbar->insertPermanentFixedItem(i18n("00000 Keys, 000 Groups"), 0);
-       statusbar->changeItem(QLatin1String( "" ), 0);
+       
statusbar->insertPermanentFixedItem(KGpgItemModel::statusCountMessageString(9999,
 999), 0);
+       statusbar->changeItem(QString(), 0);
 
        cg = KConfigGroup(KGlobal::config().data(), "MainWindow");
        setAutoSaveSettings(cg, true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/kgpginterface.cpp 
new/kdeutils-4.6.1/kgpg/kgpginterface.cpp
--- old/kdeutils-4.6.0/kgpg/kgpginterface.cpp   2011-01-18 22:24:55.000000000 
+0100
+++ new/kdeutils-4.6.1/kgpg/kgpginterface.cpp   2011-02-25 22:47:49.000000000 
+0100
@@ -466,7 +466,10 @@
        readPublicKeysProcess(process);
        readPublicKeysFin(process, true);
 
-       return m_publiclistkeys.first();
+       if (m_publiclistkeys.isEmpty())
+               return KgpgCore::KgpgKey();
+       else
+               return m_publiclistkeys.first();
 }
 
 void KgpgInterface::readPublicKeysProcess(GPGProc *p)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/main.cpp 
new/kdeutils-4.6.1/kgpg/main.cpp
--- old/kdeutils-4.6.0/kgpg/main.cpp    2011-01-18 22:24:55.000000000 +0100
+++ new/kdeutils-4.6.1/kgpg/main.cpp    2011-02-25 22:47:49.000000000 +0100
@@ -27,7 +27,7 @@
 static const char description[] =
         I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg 
very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy 
it.");
 
-static const char version[] = "2.4.92";
+static const char version[] = "2.5.0";
 
 int main(int argc, char *argv[])
 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/model/kgpgitemmodel.cpp 
new/kdeutils-4.6.1/kgpg/model/kgpgitemmodel.cpp
--- old/kdeutils-4.6.0/kgpg/model/kgpgitemmodel.cpp     2011-01-18 
22:24:55.000000000 +0100
+++ new/kdeutils-4.6.1/kgpg/model/kgpgitemmodel.cpp     2011-02-25 
22:47:49.000000000 +0100
@@ -197,6 +197,12 @@
        const int groups = m_root->groupChildren();
        const int keys = m_root->getChildCount() - groups;
 
+       return statusCountMessageString(keys, groups);
+}
+
+QString
+KGpgItemModel::statusCountMessageString(const unsigned int keys, const 
unsigned int groups)
+{
        // Most people will not have groups. Handle this case
        // special so the string isn't displayed in this case at all
        if (groups == 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/model/kgpgitemmodel.h 
new/kdeutils-4.6.1/kgpg/model/kgpgitemmodel.h
--- old/kdeutils-4.6.0/kgpg/model/kgpgitemmodel.h       2011-01-18 
22:24:55.000000000 +0100
+++ new/kdeutils-4.6.1/kgpg/model/kgpgitemmodel.h       2011-02-25 
22:47:49.000000000 +0100
@@ -71,6 +71,7 @@
 
        KGpgRootNode *getRootNode() const;
        QString statusCountMessage() const;
+       static QString statusCountMessageString(const unsigned int keys, const 
unsigned int groups);
 
 public Q_SLOTS:
        KGpgGroupNode *addGroup(const QString &name, const KGpgKeyNode::List 
&keys);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdeutils-4.6.0/kgpg/transactions/kgpggeneratekey.cpp 
new/kdeutils-4.6.1/kgpg/transactions/kgpggeneratekey.cpp
--- old/kdeutils-4.6.0/kgpg/transactions/kgpggeneratekey.cpp    2011-01-18 
22:24:55.000000000 +0100
+++ new/kdeutils-4.6.1/kgpg/transactions/kgpggeneratekey.cpp    2011-02-25 
22:47:49.000000000 +0100
@@ -17,7 +17,7 @@
 #include <KLocale>
 #include <QApplication>
 
-#include "kpimutils/email.h"
+#include <kpimutils/email.h>
 
 KGpgGenerateKey::KGpgGenerateKey(QObject *parent, const QString &name, const 
QString &email, const QString &comment,
                const KgpgCore::KgpgKeyAlgo &algorithm, const uint size, const 
unsigned int expire,
@@ -112,9 +112,7 @@
                setSuccess(TS_USER_ABORTED);
        }
        QApplication::setOverrideCursor(Qt::BusyCursor);
-       keymessage.append("%commit");
-
-       write(keymessage);
+       write("%commit");
 }
 
 bool
@@ -159,6 +157,8 @@
        } else if (line.contains(QLatin1String( "GET_" ))) {
                setSuccess(TS_MSG_SEQUENCE);
                result = true;
+       } else if (line.contains(QLatin1String("KEY_NOT_CREATED"))) {
+               result = true;
        }
 
        emit statusMessage(msg);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdeutils-4.6.0/kremotecontrol/kded/kremotecontroldaemon.desktop 
new/kdeutils-4.6.1/kremotecontrol/kded/kremotecontroldaemon.desktop
--- old/kdeutils-4.6.0/kremotecontrol/kded/kremotecontroldaemon.desktop 
2011-01-18 22:25:00.000000000 +0100
+++ new/kdeutils-4.6.1/kremotecontrol/kded/kremotecontroldaemon.desktop 
2011-02-25 22:47:49.000000000 +0100
@@ -4,6 +4,7 @@
 Name[ast]=K Remote Control Daemon
 Name[ca]=Dimoni K de comandaments a distància
 Name[ca@valencia]=Dimoni K de comandaments a distància
+Name[cs]=Démon dálkového ovládání pro KDE
 Name[da]=Dæmon til K Remote Control
 Name[de]=Fernsteuerungsdienst für KDE
 Name[en_GB]=K Remote Control Dæmon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdeutils-4.6.0/kremotecontrol/kded/kremotecontroldaemon.notifyrc 
new/kdeutils-4.6.1/kremotecontrol/kded/kremotecontroldaemon.notifyrc
--- old/kdeutils-4.6.0/kremotecontrol/kded/kremotecontroldaemon.notifyrc        
2011-01-18 22:25:00.000000000 +0100
+++ new/kdeutils-4.6.1/kremotecontrol/kded/kremotecontroldaemon.notifyrc        
2011-02-25 22:47:49.000000000 +0100
@@ -5,6 +5,7 @@
 Comment[ast]=KRemoteControl Daemon
 Comment[ca]=Dimoni KRemoteControl
 Comment[ca@valencia]=Dimoni KRemoteControl
+Comment[cs]=Dálková KRemoteControl
 Comment[da]=KRemoteControl-dæmonen
 Comment[de]=Fernsteuerungsdienst für KDE
 Comment[en_GB]=KRemoteControl Dæmon
@@ -47,6 +48,7 @@
 Name[ar]=اشعار KRemoteControl
 Name[ca]=Notificació del KRemoteControl
 Name[ca@valencia]=Notificació del KRemoteControl
+Name[cs]=Oznamování KRemoteControl
 Name[da]=KRemoteControl-bekendtgørelse
 Name[de]=KRemoteControl-Benachrichtigungen
 Name[en_GB]=KRemoteControl notification


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to