Hello community,
here is the log from the commit of package kdeutils4
checked in at Wed Dec 5 23:20:10 CET 2007.
--------
--- KDE/kdeutils4/kdeutils4.changes 2007-11-28 11:27:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-12-04 16:39:10.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 4 16:39:10 CET 2007 - dmueller@suse.de
+
+- update to 3.96.3
+
+-------------------------------------------------------------------
Old:
----
kdeutils-3.96.2.tar.bz2
workaround-compiler-bugs.diff
New:
----
kdeutils-3.96.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.o16665/_old 2007-12-05 23:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.o16665/_new 2007-12-05 23:19:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 3.96.2)
+# spec file for package kdeutils4 (Version 3.96.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,15 +21,14 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 3.96.2
+Version: 3.96.3
Release: 1
-%define rversion 3.96.2
+%define rversion 3.96.3
Source0: kdeutils-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
Patch: desktop-files.diff
-Patch1: workaround-compiler-bugs.diff
Suggests: kde4-ark
Suggests: kde4-kcalc
Suggests: kde4-kcharselect
@@ -60,7 +59,6 @@
%prep
%setup -q -n kdeutils-%rversion
%patch
-%patch1
%build
%cmake_kde4 -d build
@@ -69,23 +67,23 @@
%install
cd build
%makeinstall
- %create_subdir_filelist -d ark -n kdeutils-%rversion
- %create_subdir_filelist -d kcalc -n kdeutils-%rversion
- %create_subdir_filelist -d kcharselect -n kdeutils-%rversion
- %create_subdir_filelist -d kdessh -n kdeutils-%rversion
- %create_subdir_filelist -d kdf -n kdeutils-%rversion
- %create_subdir_filelist -d kfloppy -n kdeutils-%rversion
- %create_subdir_filelist -d kgpg -n kdeutils-%rversion
- %create_subdir_filelist -d khexedit -n kdeutils-%rversion
- %create_subdir_filelist -d kjots -n kdeutils-%rversion
- %create_subdir_filelist -d kmilo -n kdeutils-%rversion
- %create_subdir_filelist -d kregexpeditor -n kdeutils-%rversion
- %create_subdir_filelist -d ktimer -n kdeutils-%rversion
- %create_subdir_filelist -d kwallet -n kdeutils-%rversion
- %create_subdir_filelist -d superkaramba -n kdeutils-%rversion
- %create_subdir_filelist -d sweeper -n kdeutils-%rversion
+ %create_subdir_filelist -d ark
+ %create_subdir_filelist -d kcalc
+ %create_subdir_filelist -d kcharselect
+ %create_subdir_filelist -d kdessh
+ %create_subdir_filelist -d kdf
+ %create_subdir_filelist -d kfloppy
+ %create_subdir_filelist -d kgpg
+ %create_subdir_filelist -d khexedit
+ %create_subdir_filelist -d kjots
+ %create_subdir_filelist -d kmilo
+ %create_subdir_filelist -d kregexpeditor
+ %create_subdir_filelist -d ktimer
+ %create_subdir_filelist -d kwallet
+ %create_subdir_filelist -d superkaramba
+ %create_subdir_filelist -d sweeper
cd ..
- cat filelists/* | while read line; do echo "%exclude $line";done >filelists/exclude
+ %create_exclude_filelist
%suse_update_desktop_file superkaramba Utility DesktopUtility
%suse_update_desktop_file KCharSelect Utility Accessibility
%suse_update_desktop_file khexedit Utility Editor
@@ -512,6 +510,8 @@
%doc AUTHORS COPYING COPYING-DOCS README
%changelog
+* Tue Dec 04 2007 - dmueller@suse.de
+- update to 3.96.3
* Wed Nov 28 2007 - dmueller@suse.de
- update to 3.96.2
* Wed Nov 21 2007 - dmueller@suse.de
++++++ kdeutils-3.96.2.tar.bz2 -> kdeutils-3.96.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ark/app/ark.desktop new/kdeutils-3.96.3/ark/app/ark.desktop
--- old/kdeutils-3.96.2/ark/app/ark.desktop 2007-11-20 23:00:51.000000000 +0100
+++ new/kdeutils-3.96.3/ark/app/ark.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -15,7 +15,7 @@
GenericName[et]=Arhiivide haldamise rakendus
GenericName[eu]=Artxibaketa Tresna
GenericName[fa]=ابزار بایگانی
-GenericName[fi]=Pakettienhallintatyökalu
+GenericName[fi]=Arkistotyökalu
GenericName[fr]=Outil de manipulation d'archives
GenericName[ga]=Uirlis Chartlannaithe
GenericName[gl]=Ferramenta de Arquivo
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ark/kerfuffle/kerfufflePlugin.desktop new/kdeutils-3.96.3/ark/kerfuffle/kerfufflePlugin.desktop
--- old/kdeutils-3.96.2/ark/kerfuffle/kerfufflePlugin.desktop 2007-11-20 23:00:52.000000000 +0100
+++ new/kdeutils-3.96.3/ark/kerfuffle/kerfufflePlugin.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -7,6 +7,7 @@
Comment[el]=Πρόσθετο χειρισμού μορφών αρχειοθήκης για τη βιβλιοθήκη Kerfuffle
Comment[es]=Complemento para manejar formatos de archivo de la biblioteca Kerfuffle
Comment[et]=Kerfuffle'i teegi arhiivifailide haldamise plugin
+Comment[fi]=Liitännäinen eri arkistoformaattien käsittelyä varten
Comment[he]=תוסף לניהול פורמטי ארכיונים לספריית Kerfuffle
Comment[ja]=Kerfuffle ライブラリのアーカイブ形式を扱うプラグイン
Comment[ko]=Kerfuffle 라이브러리를 위한 압축 파일 플러그인
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ark/part/ark_part.desktop new/kdeutils-3.96.3/ark/part/ark_part.desktop
--- old/kdeutils-3.96.2/ark/part/ark_part.desktop 2007-11-20 23:00:52.000000000 +0100
+++ new/kdeutils-3.96.3/ark/part/ark_part.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -69,7 +69,7 @@
Comment[et]=Arhiivide haldamise rakendus
Comment[eu]=Artxiboak Kudeatzeko tresna
Comment[fa]=ابزار گرداندن بایگانی
-Comment[fi]=Pakettienhallintatyökalu
+Comment[fi]=Tiedostoarkistojen käsittely
Comment[fr]=Outil de manipulation d'archives
Comment[ga]=Uirlis Láimhseála Cartlainne
Comment[gl]=Ferramenta de manexo de arquivos
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/charselectapplet/kcharselectapplet.desktop new/kdeutils-3.96.3/charselectapplet/kcharselectapplet.desktop
--- old/kdeutils-3.96.2/charselectapplet/kcharselectapplet.desktop 2007-11-20 23:00:49.000000000 +0100
+++ new/kdeutils-3.96.3/charselectapplet/kcharselectapplet.desktop 2007-12-04 13:14:27.000000000 +0100
@@ -56,6 +56,7 @@
Comment[es]=Le permite seleccionar caracteres para copiarlos en el portapapeles
Comment[et]=Sümbolite valimine lõikepuhvrisse
Comment[fa]=انتخاب نویسههای نمایشدادهشده را برای تخته یادداشت اجازه میدهد
+Comment[fi]=Poimi merkkejä leikepöydälle
Comment[ga]=Roghnaigh carachtair speisialta don ghearrthaisce
Comment[gl]=Permite escoller caracteres para o portarretallos
Comment[ja]=文字を選択してクリップボードにコピーします
Files old/kdeutils-3.96.2/doc/ark/index.cache.bz2 and new/kdeutils-3.96.3/doc/ark/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kcalc/index.cache.bz2 and new/kdeutils-3.96.3/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kcharselect/index.cache.bz2 and new/kdeutils-3.96.3/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kdelirc/irkick/index.cache.bz2 and new/kdeutils-3.96.3/doc/kdelirc/irkick/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kdelirc/kcmlirc/index.cache.bz2 and new/kdeutils-3.96.3/doc/kdelirc/kcmlirc/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kdf/index.cache.bz2 and new/kdeutils-3.96.3/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kfloppy/index.cache.bz2 and new/kdeutils-3.96.3/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kgpg/index.cache.bz2 and new/kdeutils-3.96.3/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/khexedit/index.cache.bz2 and new/kdeutils-3.96.3/doc/khexedit/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kinfocenter/blockdevices/index.cache.bz2 and new/kdeutils-3.96.3/doc/kinfocenter/blockdevices/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kjots/index.cache.bz2 and new/kdeutils-3.96.3/doc/kjots/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/KRegExpEditor/index.cache.bz2 and new/kdeutils-3.96.3/doc/KRegExpEditor/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/ksim/index.cache.bz2 and new/kdeutils-3.96.3/doc/ksim/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/ktimer/index.cache.bz2 and new/kdeutils-3.96.3/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/kwallet/index.cache.bz2 and new/kdeutils-3.96.3/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-3.96.2/doc/superkaramba/index.cache.bz2 and new/kdeutils-3.96.3/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kcalc/knumber/knumber.cpp new/kdeutils-3.96.3/kcalc/knumber/knumber.cpp
--- old/kdeutils-3.96.2/kcalc/knumber/knumber.cpp 2007-11-27 18:20:33.000000000 +0100
+++ new/kdeutils-3.96.3/kcalc/knumber/knumber.cpp 2007-12-04 13:14:29.000000000 +0100
@@ -77,7 +77,7 @@
{
if ( isinf(num) ) _num = new _knumerror( _knumber::Infinity );
else if ( isnan(num) ) _num = new _knumerror( _knumber::UndefinedNumber );
- else _num = new _knumfloat(num);
+ else _num = new _knumfloat(num);
}
@@ -142,7 +142,7 @@
{
if (type() != FractionType)
return;
-
+
_knumfraction *tmp_num = dynamic_cast<_knumfraction *>(_num);
if (tmp_num->isInteger()) {
@@ -156,7 +156,7 @@
KNumber const & KNumber::operator=(KNumber const & num)
{
- if (this == & num)
+ if (this == & num)
return *this;
delete _num;
@@ -175,7 +175,7 @@
_num = new _knumfloat();
break;
};
-
+
_num->copy(*(num._num));
return *this;
@@ -201,7 +201,7 @@
_num = new _knumfloat();
break;
};
-
+
_num->copy(*(tmp_num._num));
return *this;
@@ -227,7 +227,7 @@
_num = new _knumfloat();
break;
};
-
+
_num->copy(*(tmp_num._num));
return *this;
@@ -410,7 +410,7 @@
default:
return QString(_num->ascii());
}
-
+
if (prec >= 0)
return roundNumber(tmp_str, prec);
else
@@ -674,9 +674,9 @@
return static_cast<unsigned long int>(*_num);
#elif SIZEOF_UNSIGNED_LONG == 4
KNumber tmp_num1 = this->abs().integerPart();
- quint64 tmp_num2 = static_cast<unsigned long int>(tmp_num1) +
- (static_cast<quint64>(static_cast<unsigned long int>(tmp_num1 >> KNumber("32"))) << 32) ;
-
+ quint64 tmp_num2 = static_cast<quint32>(tmp_num1) +
+ (static_cast<quint64>(static_cast<quint32>(tmp_num1 >> KNumber("32"))) << 32) ;
+
#ifdef __GNUC__
#warning "the cast operator from KNumber to quint64 is probably buggy, when a sign is involved"
#endif
@@ -686,7 +686,7 @@
return static_cast<quint64> (- static_cast<qint64>(tmp_num2));
#else
#error "SIZEOF_UNSIGNED_LONG is a unhandled case"
-#endif
+#endif
}
KNumber::operator double(void) const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kcharselect/KCharSelect.desktop new/kdeutils-3.96.3/kcharselect/KCharSelect.desktop
--- old/kdeutils-3.96.2/kcharselect/KCharSelect.desktop 2007-11-20 23:00:49.000000000 +0100
+++ new/kdeutils-3.96.3/kcharselect/KCharSelect.desktop 2007-12-04 13:14:27.000000000 +0100
@@ -14,7 +14,7 @@
GenericName[et]=Sümbolite valija
GenericName[eu]=Karaktere Hautatzailea
GenericName[fa]=گزینندۀ نویسه
-GenericName[fi]=Valitse merkki leikepöydälle
+GenericName[fi]=Merkin valitsin
GenericName[fr]=Sélecteur de caractères
GenericName[ga]=Roghnóir Carachtar
GenericName[gl]=Selector de caracteres
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kgpg/keysmanager.cpp new/kdeutils-3.96.3/kgpg/keysmanager.cpp
--- old/kdeutils-3.96.2/kgpg/keysmanager.cpp 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.3/kgpg/keysmanager.cpp 2007-12-04 13:14:28.000000000 +0100
@@ -156,7 +156,7 @@
connect(action, SIGNAL(triggered(bool)), SLOT(slotManpage()));
action = actionCollection()->addAction("kgpg_editor");
- action->setIcon(KIcon("edit"));
+ action->setIcon(KIcon("object-edit"));
action->setText(i18n("&Open Editor"));
connect(action, SIGNAL(triggered(bool)), SLOT(slotOpenEditor()));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kgpg/kgpg.cpp new/kdeutils-3.96.3/kgpg/kgpg.cpp
--- old/kdeutils-3.96.2/kgpg/kgpg.cpp 2007-11-27 18:20:33.000000000 +0100
+++ new/kdeutils-3.96.3/kgpg/kgpg.cpp 2007-12-04 13:14:28.000000000 +0100
@@ -113,7 +113,7 @@
saveDecrypt = new KAction(KIcon(QString("document-decrypt")), i18n("&Decrypt && Save File"), this);
saveDecrypt->setObjectName("decrypt_file");
connect(saveDecrypt, SIGNAL(triggered(bool)), SLOT(decryptDroppedFile()));
- showDecrypt = new KAction(KIcon(QString("edit")), i18n("&Show Decrypted File"), this);
+ showDecrypt = new KAction(KIcon(QString("object-edit")), i18n("&Show Decrypted File"), this);
showDecrypt->setObjectName("show_file");
connect(showDecrypt, SIGNAL(triggered(bool)), SLOT(showDroppedFile()));
encrypt = new KAction(KIcon(QString("document-encrypt")), i18n("&Encrypt File"), this);
@@ -261,10 +261,15 @@
optionbx->addItem(i18n("Bzip2"));
connect(optionbx,SIGNAL(activated (int)),this,SLOT(slotSetCompression(int)));
- connect(dialog,SIGNAL(selectedKey(QStringList,QStringList,bool,bool)),this,SLOT(startFolderEncode(QStringList,QStringList,bool,bool)));
+ connect(dialog, SIGNAL(okClicked()), this, SLOT(startFolderEncode()));
+ connect(dialog, SIGNAL(cancelClicked()), this, SLOT(slotAbortEnc()));
dialog->exec();
- dialog=0L;
+}
+
+void MyView::slotAbortEnc()
+{
+ dialog = NULL;
}
void MyView::slotSetCompression(int cp)
@@ -272,8 +277,11 @@
compressionScheme = cp;
}
-void MyView::startFolderEncode(const QStringList &selec, const QStringList &encryptOptions,bool ,bool symetric)
+void MyView::startFolderEncode()
{
+ QStringList selec = dialog->selectedKeys();
+ QStringList encryptOptions = dialog->getCustomOptions().split(' ', QString::SkipEmptyParts);
+ bool symetric = dialog->getSymmetric();
QString extension;
if (compressionScheme == 0)
@@ -284,7 +292,7 @@
else
extension = ".tar.bz2";
- if (encryptOptions.contains("armor"))
+ if (dialog->getArmor())
extension += ".asc";
else
if (KGpgSettings::pgpExtension())
@@ -292,14 +300,23 @@
else
extension += ".gpg";
- KUrl encryptedFile(droppedUrls.first().path() + extension);
- QFile encryptedFolder(droppedUrls.first().path() + extension);
+ if (dialog->getArmor())
+ encryptOptions << "--armor";
+ if (dialog->getHideId())
+ encryptOptions << "--throw-keyids";
+
+ QString fname = droppedUrls.first().path();
+ if (fname.endsWith('/'))
+ fname.remove(fname.length() - 1, 1);
+ KUrl encryptedFile = KUrl::fromPath(fname + extension);
+ QFile encryptedFolder(encryptedFile.path());
if (encryptedFolder.exists())
{
dialog->hide();
KIO::RenameDialog over(0, i18n("File Already Exists"), KUrl(), encryptedFile, KIO::M_OVERWRITE);
if (over.exec() == QDialog::Rejected)
{
+ dialog = NULL;
return;
}
encryptedFile = over.newDestUrl();
@@ -326,6 +343,7 @@
if (!arch->open(QIODevice::WriteOnly))
{
KMessageBox::sorry(0,i18n("Unable to create temporary file"));
+ delete arch;
return;
}
@@ -333,21 +351,23 @@
arch->close();
KgpgInterface *folderprocess = new KgpgInterface();
- connect(folderprocess, SIGNAL(fileEncryptionFinished(KUrl)), this, SLOT(slotFolderFinished(KUrl, KgpgInterface*)));
- connect(folderprocess, SIGNAL(errorMessage(QString)), this, SLOT(slotFolderFinishedError(QString, KgpgInterface*)));
- folderprocess->encryptFile(selec, KUrl(kgpgfoldertmp->fileName()), encryptedFile, encryptOptions, symetric);
+ connect(folderprocess, SIGNAL(fileEncryptionFinished(KUrl, KgpgInterface*)), this, SLOT(slotFolderFinished(KUrl, KgpgInterface*)));
+ connect(folderprocess, SIGNAL(errorMessage(const QString &, KgpgInterface*)), this, SLOT(slotFolderFinishedError(const QString &, KgpgInterface*)));
+ folderprocess->encryptFile(selec, KUrl(kgpgfoldertmp->fileName()), encryptedFile, encryptOptions, symetric, arch);
}
-void MyView::slotFolderFinished(const KUrl &, const KgpgInterface*)
+void MyView::slotFolderFinished(const KUrl &, KgpgInterface *iface)
{
delete pop;
delete kgpgfoldertmp;
+ delete iface;
}
-void MyView::slotFolderFinishedError(const QString &errmsge, const KgpgInterface*)
+void MyView::slotFolderFinishedError(const QString &errmsge, KgpgInterface *iface)
{
delete pop;
delete kgpgfoldertmp;
+ delete iface;
KMessageBox::sorry(0, errmsge);
}
@@ -903,7 +923,7 @@
QMenu *conf_menu = contextMenu();
QAction *KgpgOpenEditor = actionCollection()->addAction("kgpg_editor");
- KgpgOpenEditor->setIcon(KIcon("edit"));
+ KgpgOpenEditor->setIcon(KIcon("object-edit"));
KgpgOpenEditor->setText(i18n("E&ditor"));
connect(KgpgOpenEditor, SIGNAL(triggered(bool)), parent, SLOT(slotOpenEditor()));
QAction *KgpgOpenManager = actionCollection()->addAction("kgpg_manager");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kgpg/kgpg.h new/kdeutils-3.96.3/kgpg/kgpg.h
--- old/kdeutils-3.96.2/kgpg/kgpg.h 2007-11-06 09:01:38.000000000 +0100
+++ new/kdeutils-3.96.3/kgpg/kgpg.h 2007-12-04 13:14:28.000000000 +0100
@@ -88,10 +88,11 @@
void busyMessage(const QString &mssge, bool reset = false);
void slotVerifyFile();
void encryptDroppedFolder();
- void startFolderEncode(const QStringList &selec, const QStringList &encryptOptions, bool, bool symetric);
- void slotFolderFinished(const KUrl &, const KgpgInterface*);
- void slotFolderFinishedError(const QString &errmsge, const KgpgInterface*);
+ void startFolderEncode();
+ void slotFolderFinished(const KUrl &, KgpgInterface *);
+ void slotFolderFinishedError(const QString &errmsge, KgpgInterface *);
void encryptFiles(KUrl::List urls);
+ void slotAbortEnc();
protected:
virtual void dragEnterEvent(QDragEnterEvent *);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kgpg/kgpginterface.cpp new/kdeutils-3.96.3/kgpg/kgpginterface.cpp
--- old/kdeutils-3.96.2/kgpg/kgpginterface.cpp 2007-11-20 23:00:49.000000000 +0100
+++ new/kdeutils-3.96.3/kgpg/kgpginterface.cpp 2007-12-04 13:14:28.000000000 +0100
@@ -36,6 +36,7 @@
#include <KDebug>
#include <KGlobal>
#include <KUrl>
+#include <KArchive>
#include "detailedconsole.h"
#include "kgpgsettings.h"
@@ -1358,7 +1359,7 @@
}
}
-void KgpgInterface::encryptFile(const QStringList &encryptkeys, const KUrl &srcurl, const KUrl &desturl, const QStringList &options, const bool &symetrical)
+void KgpgInterface::encryptFile(const QStringList &encryptkeys, const KUrl &srcurl, const KUrl &desturl, const QStringList &options, const bool &symetrical, KArchive *ar)
{
m_partialline.clear();
m_ispartial = false;
@@ -1366,6 +1367,7 @@
sourceFile = srcurl;
message.clear();
+ arch = ar;
K3ProcIO *process = gpgProc(2, 0);
process->setParent(this);
@@ -1454,6 +1456,7 @@
void KgpgInterface::fileEncryptFin(K3Process *p)
{
delete p;
+ delete arch;
if (encok)
emit fileEncryptionFinished(sourceFile, this);
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kgpg/kgpginterface.h new/kdeutils-3.96.3/kgpg/kgpginterface.h
--- old/kdeutils-3.96.2/kgpg/kgpginterface.h 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.3/kgpg/kgpginterface.h 2007-12-04 13:14:28.000000000 +0100
@@ -31,6 +31,7 @@
class K3ProcIO;
class KProcess;
class GPGProc;
+class KArchive;
/**
* This class is the interface for gpg.
@@ -254,13 +255,16 @@
/**
* emitted when an error occurred
*/
- void errorMessage(QString, KgpgInterface*);
+ void errorMessage(const QString &, KgpgInterface*);
/**
* true if encryption successful, false on error.
*/
void fileEncryptionFinished(KUrl, KgpgInterface*);
+private:
+ KArchive *arch;
+
public slots:
/**
* Encrypt file function
@@ -270,7 +274,7 @@
* @param Options String List with the wanted gpg options. ex: "--armor"
* @param symetrical bool whether the encryption should be symmetrical.
*/
- void encryptFile(const QStringList &encryptkeys, const KUrl &srcurl, const KUrl &desturl, const QStringList &options = QStringList(), const bool &symetrical = false);
+ void encryptFile(const QStringList &encryptkeys, const KUrl &srcurl, const KUrl &desturl, const QStringList &options = QStringList(), const bool &symetrical = false, KArchive *ar = NULL);
private slots:
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/khexedit/toplevel.cc new/kdeutils-3.96.3/khexedit/toplevel.cc
--- old/kdeutils-3.96.2/khexedit/toplevel.cc 2007-10-25 11:32:09.000000000 +0200
+++ new/kdeutils-3.96.3/khexedit/toplevel.cc 2007-12-04 13:14:29.000000000 +0100
@@ -949,7 +949,7 @@
if( mode.readOnly == false )
{
- mWriteProtectButton->setIcon(KIcon("edit"));
+ mWriteProtectButton->setIcon(KIcon("object-edit"));
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kjots/kjotsentry.cpp new/kdeutils-3.96.3/kjots/kjotsentry.cpp
--- old/kdeutils-3.96.2/kjots/kjotsentry.cpp 2007-10-03 13:47:42.000000000 +0200
+++ new/kdeutils-3.96.3/kjots/kjotsentry.cpp 2007-12-04 13:14:28.000000000 +0100
@@ -616,7 +616,7 @@
KJotsPage::KJotsPage()
{
m_isBook = false;
- setIcon(0, KIconLoader::global()->loadIcon(QString("edit"), KIconLoader::Small));
+ setIcon(0, KIconLoader::global()->loadIcon(QString("object-edit"), KIconLoader::Small));
setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled
| Qt::ItemIsEnabled);
connect(&document, SIGNAL(modificationChanged(bool)), SLOT(documentModified(bool)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/klaptopdaemon/menus/.directory new/kdeutils-3.96.3/klaptopdaemon/menus/.directory
--- old/kdeutils-3.96.2/klaptopdaemon/menus/.directory 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/klaptopdaemon/menus/.directory 2007-12-04 13:14:28.000000000 +0100
@@ -8,6 +8,7 @@
Name[es]=Portátil
Name[et]=Sülearvuti
Name[fa]=رایانۀ کیفی
+Name[fi]=Kannettava
Name[ga]=Ríomhaire Glúine
Name[gl]=Portátil
Name[he]=מחשב נייד
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/klaptopdaemon/menus/klaptopdaemon.desktop new/kdeutils-3.96.3/klaptopdaemon/menus/klaptopdaemon.desktop
--- old/kdeutils-3.96.2/klaptopdaemon/menus/klaptopdaemon.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/klaptopdaemon/menus/klaptopdaemon.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -21,7 +21,7 @@
Comment[et]=Sülearvuti aku jälgija
Comment[eu]=Magalekoaren bateria begiralea
Comment[fa]=نمایشگر باتری رایانۀ کیفی
-Comment[fi]=Kannettavan koneen akkutarkkailja
+Comment[fi]=Kannettavan koneen akun tarkkailu
Comment[fr]=Indicateur de batterie de portable
Comment[ga]=Monatóir chadhnra ríomhaire glúine
Comment[gl]=Vixilante da batería do portátil
@@ -69,7 +69,7 @@
Name[et]=Sülearvuti aku jälgija
Name[eu]=Magalekoaren Bateria Begiralea
Name[fa]=نمایشگر باتری رایانۀ کیفی
-Name[fi]=Akkutarkkailija
+Name[fi]=Kannettavan koneen akun tarkkailu
Name[fr]=Indicateur de batterie de portable
Name[ga]=Monatóir Chadhnra Ríomhaire Glúine
Name[gl]=Vixilante da batería do portátil
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kmilo/asus/kmilo_asus.desktop new/kdeutils-3.96.3/kmilo/asus/kmilo_asus.desktop
--- old/kdeutils-3.96.2/kmilo/asus/kmilo_asus.desktop 2007-11-20 23:00:51.000000000 +0100
+++ new/kdeutils-3.96.3/kmilo/asus/kmilo_asus.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -59,7 +59,7 @@
Comment[et]=Võimaldab kasutada Asuse sülearvuti eriklahve
Comment[eu]=Asus eramangarrien tekla berezientzako euskarria gaitzen du
Comment[fa]=Asus فعالسازی پشتیبانی برای کلیدهای ویژۀ رایانۀ کیفی
-Comment[fi]=Tämä liitännäinen mahdollistaa erikoisnäppäinten tuen Asus-merkkisille kannettaville tietokoneille.
+Comment[fi]=Ottaa käyttöön Asus-kannettavien erikoisnäppäimet
Comment[fr]=Ce module active la gestion des touches spéciales des ordinateurs portables Asus
Comment[ga]=Tacaigh le heochracha speisialta ar ríomhairí glúine Asus
Comment[gl]=Dá soporte para teclas especiais dos portáteis Asus
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kmilo/delli8k/kmilo_delli8k.desktop new/kdeutils-3.96.3/kmilo/delli8k/kmilo_delli8k.desktop
--- old/kdeutils-3.96.2/kmilo/delli8k/kmilo_delli8k.desktop 2007-11-20 23:00:51.000000000 +0100
+++ new/kdeutils-3.96.3/kmilo/delli8k/kmilo_delli8k.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -59,7 +59,7 @@
Comment[et]=Võimaldab kasutada Delli sülearvuti eriklahve
Comment[eu]=Dell eramangarrien tekla berezientzako euskarria gaitzen du
Comment[fa]=فعالسازی پشتیبانی برای کلیدهای ویژۀ رایانۀ کیفیDell
-Comment[fi]=Tämä liitännäinen mahdollistaa erikoisnäppäinten tuen Dellin kannettaville tietokoneille.
+Comment[fi]=Ottaa käyttöön Dell-kannettavien erikoisnäppäimet
Comment[fr]=Ce module active la gestion des touches spéciales des ordinateurs portables Dell
Comment[ga]=Tacaigh le heochracha speisialta ar ríomhairí glúine Dell
Comment[gl]=Dá soporte para teclas especiais dos portáteis Dell
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kmilo/generic/kmilo_generic.desktop new/kdeutils-3.96.3/kmilo/generic/kmilo_generic.desktop
--- old/kdeutils-3.96.2/kmilo/generic/kmilo_generic.desktop 2007-11-20 23:00:51.000000000 +0100
+++ new/kdeutils-3.96.3/kmilo/generic/kmilo_generic.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -66,7 +66,7 @@
Comment[et]=See plugin võimaldab kasutada eriklahve igasugustel klaviatuuridel ja sülearvutitel.
Comment[eu]=Plugin honek tekla berezientzako euskarria gaitzen du teklatu eta magaleko mota guztietan.
Comment[fa]=این وصله، برای کلیدهای ویژه روی همۀ انواع صفحه کلید و رایانههای کیفی، پشتیبانی را فعال میسازد.
-Comment[fi]=Tämä liitännäinen mahdollistaa erikoisnäppäinten tuen kaikenlaisille näppäimistöille ja kannettavilla tietokoneille.
+Comment[fi]=Tämä liitännäinen tukee kaikenlaisten näppäimistöjen ja kannettavien tietokoneiden erikoisnäppäimiä.
Comment[fr]=Ce module active la gestion des touches spéciales pour toutes sortes de claviers et de portables.
Comment[ga]=Tacaíonn an breiseán seo le cnaipí speisialta ar neart sóirt méarchlár agus ríomhairí glúine.
Comment[gl]=Esta extensión dá soporte para teclas especiais de calquer tipo de teclados e portáteis.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kregexpeditor/editorwindow.cpp new/kdeutils-3.96.3/kregexpeditor/editorwindow.cpp
--- old/kdeutils-3.96.2/kregexpeditor/editorwindow.cpp 2007-10-03 13:47:48.000000000 +0200
+++ new/kdeutils-3.96.3/kregexpeditor/editorwindow.cpp 2007-12-04 13:14:29.000000000 +0100
@@ -340,7 +340,7 @@
_menu->insertItem(getIcon(QString::fromLocal8Bit("edit-paste")),
i18n("&Paste"), PASTE);
_menu->addSeparator();
- _menu->insertItem(getIcon(QString::fromLocal8Bit("edit")),
+ _menu->insertItem(getIcon(QString::fromLocal8Bit("object-edit")),
i18n("&Edit"), EDIT);
_menu->insertItem(getIcon(QString::fromLocal8Bit("document-save")),
i18n("&Save Regular Expression..."), SAVE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ksim/ksim.desktop new/kdeutils-3.96.3/ksim/ksim.desktop
--- old/kdeutils-3.96.2/ksim/ksim.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/ksim/ksim.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -14,7 +14,7 @@
GenericName[et]=Süsteemi jälgija
GenericName[eu]=Sistemaren Begiralea
GenericName[fa]=نمایشگر سیستم
-GenericName[fi]=Järjestelmänvalvontaohjelma
+GenericName[fi]=Järjestelmän valvonta
GenericName[fr]=Indicateurs du système
GenericName[ga]=Monatóir Córais
GenericName[gl]=Vixilante do sistema
@@ -64,6 +64,7 @@
Comment[es]=Monitor de información del sistema K (estilo GKrellM)
Comment[et]=Süsteemi info jälgija (GKrellM stiil)
Comment[fa]=نمایشگر اطلاعات سیستم K )سبک GKrellM(
+Comment[fi]=K-Järjestelmän valvonta (GKrellM-tyylinen)
Comment[ga]=Monatóir Eolais an Chórais K (stíl GKrellM)
Comment[gl]=Vixilante da información do sistema K (estilo GKrellM)
Comment[he]=צג מידע מערכת (נוסח GKrellM)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ksim/monitors/cpu/cpu.desktop new/kdeutils-3.96.3/ksim/monitors/cpu/cpu.desktop
--- old/kdeutils-3.96.2/ksim/monitors/cpu/cpu.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/ksim/monitors/cpu/cpu.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -40,7 +40,7 @@
Comment[et]=Protsessori jälgija
Comment[eu]=CPU Plugin Begiralea
Comment[fa]=وصلۀ نمایشگر واحد پردازش مرکزی
-Comment[fi]=Suorittimentarkkailusovelma
+Comment[fi]=Suorittimen valvontaliitännäinen
Comment[fr]=Module de surveillance du processeur
Comment[ga]=Breiseán Monatóireachta LAP
Comment[gl]=Extensión de vixilancia da CPU
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ksim/monitors/disk/disk.desktop new/kdeutils-3.96.3/ksim/monitors/disk/disk.desktop
--- old/kdeutils-3.96.2/ksim/monitors/disk/disk.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/ksim/monitors/disk/disk.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -13,7 +13,7 @@
Comment[et]=Ketta jälgija
Comment[eu]=Diskoaren Plugin Begiralea
Comment[fa]=وصلۀ نمایشگر دیسک
-Comment[fi]=Levyntarkkailusovelma
+Comment[fi]=Levyn valvontaliitännäinen
Comment[fr]=Module de surveillance du disque
Comment[ga]=Breiseán Monatóireachta Diosca
Comment[gl]=Extensión de vixilancia do disco
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ksim/monitors/i8k/i8k.desktop new/kdeutils-3.96.3/ksim/monitors/i8k/i8k.desktop
--- old/kdeutils-3.96.2/ksim/monitors/i8k/i8k.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/ksim/monitors/i8k/i8k.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -11,7 +11,7 @@
Comment[et]=Dell I8K riistvara jälgimise plugin
Comment[eu]=Dell I8K Hardwarearen Plugin Begiralea
Comment[fa]=وصلۀ نمایشگر سختافزار Dell I8K
-Comment[fi]=Dell I8K-laitteistomonitoriliitännäinen
+Comment[fi]=Dell I8K-laitteiston valvontaliitännäinen
Comment[fr]=Module de surveillance du Dell l8K
Comment[ga]=Breiseán Monatóireachta Cruaearraí Dell I8K
Comment[gl]=Extensión de vixilancia do hardware dos Dell I8k
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/ksim/monitors/mail/mail.desktop new/kdeutils-3.96.3/ksim/monitors/mail/mail.desktop
--- old/kdeutils-3.96.2/ksim/monitors/mail/mail.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/ksim/monitors/mail/mail.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -13,7 +13,7 @@
Comment[et]=E-posti jälgija
Comment[eu]=Postaren Plugin Begiralea
Comment[fa]=وصلۀ نمایشگر نامه
-Comment[fi]=Sähköpostin monitorointisovelma
+Comment[fi]=Sähköpostin valvontaliitännäinen
Comment[fr]=Module de surveillance de boîtes aux lettres
Comment[ga]=Breiseán Monatóireachta Ríomhphoist
Comment[gl]=Extensión de vixilancia do correo
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kwallet/allyourbase.cpp new/kdeutils-3.96.3/kwallet/allyourbase.cpp
--- old/kdeutils-3.96.2/kwallet/allyourbase.cpp 2007-10-03 13:47:43.000000000 +0200
+++ new/kdeutils-3.96.3/kwallet/allyourbase.cpp 2007-12-04 13:14:28.000000000 +0100
@@ -252,7 +252,7 @@
return true;
}
-void KWalletItem::dropped(QDropEvent *e, const QList<Q3IconDragItem>& lst) {
+void KWalletItem::dropped(QDropEvent *e, const Q3ValueList<Q3IconDragItem>& lst) {
Q_UNUSED(lst);
if (e->provides("application/x-kwallet-folder") ||
e->provides("text/uri-list")) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kwallet/allyourbase.h new/kdeutils-3.96.3/kwallet/allyourbase.h
--- old/kdeutils-3.96.2/kwallet/allyourbase.h 2007-10-03 13:47:43.000000000 +0200
+++ new/kdeutils-3.96.3/kwallet/allyourbase.h 2007-12-04 13:14:28.000000000 +0100
@@ -134,7 +134,7 @@
virtual bool acceptDrop(const QMimeSource *mime) const;
protected:
- virtual void dropped(QDropEvent *e, const QList<Q3IconDragItem>& lst);
+ virtual void dropped(QDropEvent *e, const Q3ValueList<Q3IconDragItem>& lst);
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/kwallet/konfigurator/kwalletconfig.desktop new/kdeutils-3.96.3/kwallet/konfigurator/kwalletconfig.desktop
--- old/kdeutils-3.96.2/kwallet/konfigurator/kwalletconfig.desktop 2007-11-20 23:00:50.000000000 +0100
+++ new/kdeutils-3.96.3/kwallet/konfigurator/kwalletconfig.desktop 2007-12-04 13:14:28.000000000 +0100
@@ -22,7 +22,6 @@
Name[es]=Cartera de KDE
Name[et]=KDE turvalaegas
Name[eu]=KDE Kartera
-Name[fi]=Lompakko
Name[fr]=Gestionnaire de comptes de KDE
Name[hu]=Digitális noteszek
Name[is]=KDE veskið
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/superkaramba/skapplet/plasma-skapplet-default.desktop new/kdeutils-3.96.3/superkaramba/skapplet/plasma-skapplet-default.desktop
--- old/kdeutils-3.96.2/superkaramba/skapplet/plasma-skapplet-default.desktop 2007-11-20 23:00:52.000000000 +0100
+++ new/kdeutils-3.96.3/superkaramba/skapplet/plasma-skapplet-default.desktop 2007-12-04 13:14:29.000000000 +0100
@@ -13,6 +13,7 @@
Comment[eo]=SuperKaramba Plasma apleto
Comment[es]=Applet de SuperKaramba para Plasma
Comment[et]=Superkaramba plasma aplett
+Comment[fi]=SuperKaramba Plasma-sovelma
Comment[he]=יישומון Plasma עבור Superkaramba
Comment[ja]=SuperKaramba Plasma アプレット
Comment[ko]=SuperKaramba Plasma 애플릿
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.2/superkaramba/skapplet/skapplet.cpp new/kdeutils-3.96.3/superkaramba/skapplet/skapplet.cpp
--- old/kdeutils-3.96.2/superkaramba/skapplet/skapplet.cpp 2007-11-20 23:00:52.000000000 +0100
+++ new/kdeutils-3.96.3/superkaramba/skapplet/skapplet.cpp 2007-12-04 13:14:29.000000000 +0100
@@ -48,10 +48,10 @@
QPointerSkip::AppletAdaptor appletadaptor;
QPointer<Karamba> themeItem;
KUrl themePath;
- bool locked;
QList