Hello community,
here is the log from the commit of package kdeutils4 for openSUSE:Factory checked in at 2011-11-16 17:18:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdeutils4 (Old)
and /work/SRC/openSUSE:Factory/.kdeutils4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeutils4", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdeutils4/kdeutils4.changes 2011-10-06 16:36:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdeutils4.new/kdeutils4.changes 2011-11-16 17:18:54.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Nov 2 20:24:24 CET 2011 - dmueller@suse.de
+
+- update to 4.7.3
+ * see http://kde.org/announcements/changelogs/changelog4_7_2to4_7_3.php for details
+
+-------------------------------------------------------------------
+Wed Nov 2 19:20:46 CET 2011 - anixx@opensuse.org
+
+- remove kde3 provides
+
+-------------------------------------------------------------------
Old:
----
kdeutils-4.7.2.tar.bz2
New:
----
kdeutils-4.7.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.NHhPVW/_old 2011-11-16 17:19:00.000000000 +0100
+++ /var/tmp/diff_new_pack.NHhPVW/_new 2011-11-16 17:19:00.000000000 +0100
@@ -36,7 +36,7 @@
BuildRequires: python-cups
BuildRequires: python-kde4-devel
%endif
-Version: 4.7.2
+Version: 4.7.3
Release: 1
License: GPLv2+
Summary: Base Package of KDE Utility Programs
@@ -144,7 +144,6 @@
Group: Productivity/Scientific/Math
Provides: kde4-kcalc = 4.3.0
Obsoletes: kde4-kcalc < 4.3.0
-Provides: kdeutils3:/opt/kde3/bin/kcalc
%kde4_runtime_requires
%description -n kcalc
@@ -225,7 +224,6 @@
Group: System/Monitoring
Provides: kde4-kdf = 4.3.0
Obsoletes: kde4-kdf < 4.3.0
-Provides: kdeutils3:/opt/kde3/bin/kdf
%kde4_runtime_requires
%description -n kdf
@@ -248,7 +246,6 @@
Group: System/GUI/KDE
Provides: kde4-kfloppy = 4.3.0
Obsoletes: kde4-kfloppy < 4.3.0
-Provides: kdeutils3:/opt/kde3/bin/kfloppy
%kde4_runtime_requires
%description -n kfloppy
@@ -269,7 +266,6 @@
Requires: kdepim4-runtime
Provides: kde4-kgpg = 4.3.0
Obsoletes: kde4-kgpg < 4.3.0
-Provides: kdeutils3:/opt/kde3/bin/kgpg
%kde4_runtime_requires
%kde4_pimlibs_requires
@@ -368,7 +364,6 @@
Group: System/GUI/KDE
Provides: kde4-kwalletmanager = 4.3.0
Obsoletes: kde4-kwalletmanager < 4.3.0
-Provides: kdeutils3:/opt/kde3/bin/kwalletmanager
Obsoletes: %{name} < %{version}
Provides: %{name} = %{version}
%kde4_runtime_requires
@@ -391,7 +386,6 @@
Group: System/GUI/KDE
Provides: kde4-kwikdisk = 4.3.0
Obsoletes: kde4-kwikdisk < 4.3.0
-Provides: kdeutils3:/opt/kde3/bin/kwikdisk
%kde4_runtime_requires
%description -n kwikdisk
++++++ kdeutils-4.7.2.tar.bz2 -> kdeutils-4.7.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/app/ark_addtoservicemenu.desktop new/kdeutils-4.7.3/ark/app/ark_addtoservicemenu.desktop
--- old/kdeutils-4.7.2/ark/app/ark_addtoservicemenu.desktop 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/app/ark_addtoservicemenu.desktop 2011-10-28 09:53:21.000000000 +0200
@@ -319,7 +319,7 @@
Name[ga]=Comhbhrúigh Go...
Name[gl]=Comprimir en...
Name[hr]=Zapakiraj u …
-Name[hu]=Tömörítés ide...
+Name[hu]=Tömörítés ide…
Name[id]=Kompres ke...
Name[is]=Þjappa í...
Name[it]=Comprimi in...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/app/ark_dndextract.desktop new/kdeutils-4.7.3/ark/app/ark_dndextract.desktop
--- old/kdeutils-4.7.2/ark/app/ark_dndextract.desktop 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/app/ark_dndextract.desktop 2011-10-28 09:53:21.000000000 +0200
@@ -49,7 +49,7 @@
Name[sr@latin]=Raspakuj Arkom ovde
Name[sv]=Packa upp arkiv här
Name[th]=อาร์ก คลายแฟ้มไว้ที่นี่
-Name[tr]=Ark Arşivi Buraya Aç
+Name[tr]=Ark Arşivi Buraya Çıkart
Name[uk]=Видобути архів сюди з Ark
Name[wa]=Saetchî foû avou Ark cial
Name[x-test]=xxArk Extract Herexx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/app/ark_servicemenu.desktop new/kdeutils-4.7.3/ark/app/ark_servicemenu.desktop
--- old/kdeutils-4.7.2/ark/app/ark_servicemenu.desktop 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/app/ark_servicemenu.desktop 2011-10-28 09:53:21.000000000 +0200
@@ -57,7 +57,7 @@
Name[sr@latin]=Raspakuj arhivu ovde
Name[sv]=Packa upp arkiv här
Name[th]=คลายแฟ้มจัดเก็บไว้ที่นี่
-Name[tr]=Arşivi Buraya Aç
+Name[tr]=Arşivi Buraya Çıkart
Name[uk]=Видобути архів сюди
Name[wa]=Saetchî l' årtchive foû cial
Name[x-test]=xxExtract Archive Herexx
@@ -86,7 +86,7 @@
Name[ga]=Bain an chartlann amach go...
Name[gl]=Extraer o arquivo en...
Name[hr]=Otpakiraj arhivu u …
-Name[hu]=Kibontás ide...
+Name[hu]=Kibontás ide…
Name[id]=Ekstrak Arsip ke...
Name[is]=Afþjappa safnskrá í...
Name[it]=Estrai l'archivio in...
@@ -115,7 +115,7 @@
Name[sr@latin]=Raspakuj arhivu u...
Name[sv]=Packa upp arkiv i...
Name[th]=คลายแฟ้มจัดเก็บไปยัง...
-Name[tr]=Arşivi Buraya Aç...
+Name[tr]=Arşivi Şuraya Çıkart...
Name[uk]=Видобути архів до...
Name[wa]=Saetchî l' årtchive foû eyet l' rilomer...
Name[x-test]=xxExtract Archive To...xx
@@ -173,7 +173,7 @@
Name[sr@latin]=Raspakuj arhivu ovde, pogodi potfasciklu
Name[sv]=Packa upp arkiv här, detektera underkatalog automatiskt
Name[th]=คลายแฟ้มจัดเก็บไว้ที่นี่, และตรวจสอบโฟลเดอร์ย่อยอัตโนมัติ
-Name[tr]=Arşivi Buraya Aç, Klasör Yapısını Koru
+Name[tr]=Arşivi Buraya Çıkart, Alt-klasörü Otomatik Algıla
Name[uk]=Видобути архів сюди, автоматично визначити підтеку
Name[wa]=Saetchî l' årtchive foû cial, deteccion otomatike do ridant efant
Name[x-test]=xxExtract Archive Here, Autodetect Subfolderxx
Files old/kdeutils-4.7.2/ark/doc/index.cache.bz2 and new/kdeutils-4.7.3/ark/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/part/ark_part.desktop new/kdeutils-4.7.3/ark/part/ark_part.desktop
--- old/kdeutils-4.7.2/ark/part/ark_part.desktop 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/part/ark_part.desktop 2011-10-28 09:53:21.000000000 +0200
@@ -98,7 +98,7 @@
Comment[he]=כלי לניהול ארכיונים
Comment[hne]=अभिलेख संभाल औजार
Comment[hr]=Uslužni program za arhiviranje
-Comment[hu]=Tömörítóprogram
+Comment[hu]=Tömörítőprogram
Comment[id]=Perkakas Penanganan Arsip
Comment[is]=Vinna með safnskrár
Comment[it]=Gestione degli archivi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/part/part.cpp new/kdeutils-4.7.3/ark/part/part.cpp
--- old/kdeutils-4.7.2/ark/part/part.cpp 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/part/part.cpp 2011-10-28 09:53:21.000000000 +0200
@@ -558,8 +558,15 @@
if (!job->error()) {
const ArchiveEntry& entry =
m_model->entryForIndex(m_view->selectionModel()->currentIndex());
- const QString fullName =
- m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString();
+
+ QString fullName =
+ m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString();
+
+ // Make sure a maliciously crafted archive with parent folders named ".." do
+ // not cause the previewed file path to be located outside the temporary
+ // directory, resulting in a directory traversal issue.
+ fullName.remove(QLatin1String("../"));
+
ArkViewer::view(fullName, widget());
} else {
KMessageBox::error(widget(), job->errorString());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/plugins/cliplugin/kerfuffle_cli.desktop new/kdeutils-4.7.3/ark/plugins/cliplugin/kerfuffle_cli.desktop
--- old/kdeutils-4.7.2/ark/plugins/cliplugin/kerfuffle_cli.desktop 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/plugins/cliplugin/kerfuffle_cli.desktop 2011-10-28 09:53:21.000000000 +0200
@@ -51,10 +51,10 @@
Name[sk]=TODO modul archívu
Name[sl]=Vstavek za arhive OPRAVILO
Name[sq]=TODO arkiv plugin
-Name[sr]=(УРАДИ) прикључак архива
-Name[sr@ijekavian]=(УРАДИ) прикључак архива
-Name[sr@ijekavianlatin]=(URADI) priključak arhiva
-Name[sr@latin]=(URADI) priključak arhiva
+Name[sr]=Прикључак TODO архива
+Name[sr@ijekavian]=Прикључак TODO архива
+Name[sr@ijekavianlatin]=Priključak TODO arhiva
+Name[sr@latin]=Priključak TODO arhiva
Name[sv]=Insticksprogram för ATT GÖRA arkiv
Name[th]=ส่วนเสริมการจัดการแฟ้มจัดเก็บแบบ TODO
Name[tr]=TODO arşivi eklentisi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/plugins/libarchive/kerfuffle_libarchive.desktop new/kdeutils-4.7.3/ark/plugins/libarchive/kerfuffle_libarchive.desktop
--- old/kdeutils-4.7.2/ark/plugins/libarchive/kerfuffle_libarchive.desktop 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/plugins/libarchive/kerfuffle_libarchive.desktop 2011-10-28 09:53:21.000000000 +0200
@@ -120,7 +120,7 @@
Comment[sv]=Libarchive-insticksprogram för Kerfuffle
Comment[ta]=கெர்ஃபஃபில் க்கு லிப்ஆர்கைவ் சொருகி
Comment[th]=ส่วนเสริมของ Kerfuffle สำหรับใช้งานไลบรารี LibArchive
-Comment[tr]=Kerfuffle için LibArchive eklentisi
+Comment[tr]=Kerfuffle için LibArchive eklentisi
Comment[uk]=Додаток LibArchive для Kerfuffle
Comment[x-test]=xxLibArchive Plugin for Kerfufflexx
Comment[zh_CN]=Kerfuffle 的 LibArchive 插件
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop.cmake new/kdeutils-4.7.3/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop.cmake
--- old/kdeutils-4.7.2/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop.cmake 2011-10-04 20:54:16.000000000 +0200
+++ new/kdeutils-4.7.3/ark/plugins/libarchive/kerfuffle_libarchive_readonly.desktop.cmake 2011-10-28 09:53:21.000000000 +0200
@@ -41,6 +41,7 @@
Name[pl]=kerfuffle_libarchive_readonly
Name[pt]=kerfuffle_libarchive_readonly
Name[pt_BR]=kerfuffle_libarchive_readonly
+Name[ro]=kerfuffle_libarchive_readonly
Name[ru]=kerfuffle_libarchive_readonly
Name[sk]=kerfuffle_libarchive_readonly
Name[sl]=kerfuffle_libarchive_readonly
Files old/kdeutils-4.7.2/filelight/doc/index.cache.bz2 and new/kdeutils-4.7.3/filelight/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/filelight/misc/filelightpart.desktop new/kdeutils-4.7.3/filelight/misc/filelightpart.desktop
--- old/kdeutils-4.7.2/filelight/misc/filelightpart.desktop 2011-10-04 20:54:17.000000000 +0200
+++ new/kdeutils-4.7.3/filelight/misc/filelightpart.desktop 2011-10-28 09:53:22.000000000 +0200
@@ -38,7 +38,7 @@
Name[sr@latin]=Kružna mapa
Name[sv]=Radiell avbildning
Name[th]=Radial Map
-Name[tr]=Işınsal Harita
+Name[tr]=Radyal Harita
Name[uk]=Радіальна карта
Name[x-test]=xxRadial Mapxx
Name[zh_CN]=雷达图
Files old/kdeutils-4.7.2/kcalc/doc/index.cache.bz2 and new/kdeutils-4.7.3/kcalc/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kcalc/kcalc.desktop new/kdeutils-4.7.3/kcalc/kcalc.desktop
--- old/kdeutils-4.7.2/kcalc/kcalc.desktop 2011-10-04 20:54:18.000000000 +0200
+++ new/kdeutils-4.7.3/kcalc/kcalc.desktop 2011-10-28 09:53:24.000000000 +0200
@@ -99,7 +99,7 @@
GenericName[he]=מחשבון מדעי
GenericName[hne]=वैग्यानिक केल्कुलेटर
GenericName[hr]=Znanstveni kalkulator
-GenericName[hu]=Számológép
+GenericName[hu]=Tudományos számológép
GenericName[id]=Kalkulator Ilmiah
GenericName[is]=Öflug reiknivél
GenericName[it]=Calcolatrice scientifica
Files old/kdeutils-4.7.2/kcharselect/doc/index.cache.bz2 and new/kdeutils-4.7.3/kcharselect/doc/index.cache.bz2 differ
Files old/kdeutils-4.7.2/kdf/doc/app/index.cache.bz2 and new/kdeutils-4.7.3/kdf/doc/app/index.cache.bz2 differ
Files old/kdeutils-4.7.2/kdf/doc/kcontrol/index.cache.bz2 and new/kdeutils-4.7.3/kdf/doc/kcontrol/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kdf/kcmdf.desktop new/kdeutils-4.7.3/kdf/kcmdf.desktop
--- old/kdeutils-4.7.2/kdf/kcmdf.desktop 2011-10-04 20:54:20.000000000 +0200
+++ new/kdeutils-4.7.3/kdf/kcmdf.desktop 2011-10-28 09:53:26.000000000 +0200
@@ -111,7 +111,7 @@
Comment[he]=מידע על השימוש בנפח האיחסון של ההתקנים המחוברים
Comment[hne]=माउन्टेड औजार मन के डिस्क उपयोग देखाथे
Comment[hr]=Prikazuje iskorištenost diskova
-Comment[hu]=Megmutatja a csatlakoztatott (mountolt) eszközök kihasználtságát
+Comment[hu]=Megmutatja a csatolt eszközök kihasználtságát
Comment[id]=Menampilkan pemakaian diska dari perangkat yang dikaitkan
Comment[is]=Sýnir nýtingu diskanna sem eru tengdir skráarkerfinu
Comment[it]=Mostra l'uso del disco dei dispositivi montati
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kfloppy/KFloppy.desktop new/kdeutils-4.7.3/kfloppy/KFloppy.desktop
--- old/kdeutils-4.7.2/kfloppy/KFloppy.desktop 2011-10-04 20:54:20.000000000 +0200
+++ new/kdeutils-4.7.3/kfloppy/KFloppy.desktop 2011-10-28 09:53:26.000000000 +0200
@@ -26,7 +26,7 @@
GenericName[he]=מאתחל תקליטונים
GenericName[hne]=फ्लापी फार्मेटर
GenericName[hr]=Formatiranje disketa
-GenericName[hu]=Floppy-formázó
+GenericName[hu]=Hajlékonylemez-formázó
GenericName[id]=Pemformat Disket
GenericName[is]=Tól til að forsníða disklinga
GenericName[it]=Formattatore di dischetti
Files old/kdeutils-4.7.2/kfloppy/doc/index.cache.bz2 and new/kdeutils-4.7.3/kfloppy/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kfloppy/floppy_format.desktop new/kdeutils-4.7.3/kfloppy/floppy_format.desktop
--- old/kdeutils-4.7.2/kfloppy/floppy_format.desktop 2011-10-04 20:54:20.000000000 +0200
+++ new/kdeutils-4.7.3/kfloppy/floppy_format.desktop 2011-10-28 09:53:26.000000000 +0200
@@ -60,7 +60,7 @@
Name[ta]=வடிவமைப்பு
Name[th]=ฟอร์แมต
Name[tr]=Biçimlendir
-Name[ug]=فورماتى
+Name[ug]=پىچىمى
Name[uk]=Форматувати
Name[uz]=Formatlash
Name[uz@cyrillic]=Форматлаш
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/.gitignore new/kdeutils-4.7.3/kgpg/.gitignore
--- old/kdeutils-4.7.2/kgpg/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.7.3/kgpg/.gitignore 2011-10-28 09:53:29.000000000 +0200
@@ -0,0 +1,2 @@
+.kdev4
+kgpg.kdev4
Files old/kdeutils-4.7.2/kgpg/doc/index.cache.bz2 and new/kdeutils-4.7.3/kgpg/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/keyexport.cpp new/kdeutils-4.7.3/kgpg/keyexport.cpp
--- old/kdeutils-4.7.2/kgpg/keyexport.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/keyexport.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -1,10 +1,8 @@
-/***************************************************************************
- keyexport.cpp - description
- -------------------
- begin : Thu Jul 4 2002
- copyright : (C) 2002 by Jean-Baptiste Mardelle
- email : bj@altern.org
- ***************************************************************************/
+/*
+ * Copyright (C) 2002 Jean-Baptiste Mardelle
+ * Copyright (C) 2007,2011 Rolf Eike Beer
+ * Copyright (C) 2011 Luis Ángel Fernández Fernández
+ */
/***************************************************************************
* *
@@ -15,19 +13,39 @@
* *
***************************************************************************/
-
#include "keyexport.h"
+#include <KMessageBox>
+
+KeyExport::KeyExport(QWidget *parent, const QStringList &keyservers)
+ : KDialog(parent),
+ Ui_KeyExport()
+{
+ setupUi(this);
+ setMainWidget(widget);
+ setCaption(i18n("Public Key Export"));
+ setButtons(KDialog::Ok | KDialog::Cancel);
+ setDefaultButton(KDialog::Ok);
+ newFilename->setWindowTitle(i18n("Save File"));
+ newFilename->setMode(KFile::File);
+
+ if (!keyservers.isEmpty()) {
+ checkServer->setEnabled(true);
+ destServer->addItems(keyservers);
+ }
+}
-KeyExport::KeyExport(QWidget* parent, const QStringList& keyservers)
- : QWidget(parent), Ui_KeyExport()
+void KeyExport::accept()
{
- setupUi(this);
+ if (checkFile->isChecked()) {
+ if (QFile::exists(newFilename->url().path().simplified())) {
+ const QString message = i18n("Overwrite existing file %1?", newFilename->url().fileName());
+ int result = KMessageBox::warningContinueCancel(this, message, QString(), KStandardGuiItem::overwrite());
+ if (KMessageBox::Cancel == result)
+ return;
+ }
+ }
- if (keyservers.size() > 0)
- {
- checkServer->setEnabled(true);
- destServer->addItems(keyservers);
- }
+ QDialog::accept();
}
#include "keyexport.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/keyexport.h new/kdeutils-4.7.3/kgpg/keyexport.h
--- old/kdeutils-4.7.2/kgpg/keyexport.h 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/keyexport.h 2011-10-28 09:53:29.000000000 +0200
@@ -1,10 +1,8 @@
-/***************************************************************************
- keyexport.h - description
- -------------------
- begin : Thu Jul 4 2002
- copyright : (C) 2002 by Jean-Baptiste Mardelle
- email : bj@altern.org
- ***************************************************************************/
+/*
+ * Copyright (C) 2002 Jean-Baptiste Mardelle
+ * Copyright (C) 2007,2008,2009,2010,2011 Rolf Eike Beer
+ * Copyright (C) 2011 Luis Ángel Fernández Fernández
+ */
/***************************************************************************
* *
@@ -21,13 +19,18 @@
#include "ui_keyexport.h"
+#include <QStringList>
+#include <KDialog>
-class KeyExport : public QWidget, public Ui_KeyExport
+class KeyExport : public KDialog, public Ui_KeyExport
{
- Q_OBJECT
+ Q_OBJECT
public:
- explicit KeyExport(QWidget* parent = 0, const QStringList& keyservers = QStringList());
+ explicit KeyExport(QWidget *parent = 0, const QStringList &keyservers = QStringList());
+
+protected:
+ virtual void accept();
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/keyexport.ui new/kdeutils-4.7.3/kgpg/keyexport.ui
--- old/kdeutils-4.7.2/kgpg/keyexport.ui 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/keyexport.ui 2011-10-28 09:53:29.000000000 +0200
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>KeyExport</class>
- <widget class="QWidget" name="KeyExport" >
- <property name="geometry" >
+ <widget class="QWidget" name="KeyExport">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,141 +10,147 @@
<height>411</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QGroupBox" name="buttonGroup2" >
- <property name="title" >
- <string/>
- </property>
- <layout class="QVBoxLayout" >
+ <widget class="QWidget" name="widget" native="true">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QRadioButton" name="checkMail" >
- <property name="text" >
- <string comment="Export a key via email" >Email</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="checkClipboard" >
- <property name="text" >
- <string>Clipboard</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="checkServer" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Key server:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KComboBox" name="destServer" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="checkFile" >
- <property name="text" >
- <string>File:</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KUrlRequester" name="newFilename" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="buttonGroup3" >
- <property name="title" >
- <string>Export Settings</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QRadioButton" name="checkAttrAll" >
- <property name="text" >
- <string>Export everything</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="checkAttrPhoto" >
- <property name="text" >
- <string>Do not export attributes (photo ids)</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="checkAttrClean" >
- <property name="text" >
- <string comment="@option:radio Exports the smallest key possible. Maps to export-minimal option of gpg" >Clean key</string>
- </property>
+ <widget class="QGroupBox" name="buttonGroup2">
+ <property name="title">
+ <string/>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QRadioButton" name="checkMail">
+ <property name="text">
+ <string comment="Export a key via email">Email</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="checkClipboard">
+ <property name="text">
+ <string>Clipboard</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="checkServer">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Key server:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KComboBox" name="destServer">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="checkFile">
+ <property name="text">
+ <string>File:</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KUrlRequester" name="newFilename">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="buttonGroup3">
+ <property name="title">
+ <string>Export Settings</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QRadioButton" name="checkAttrAll">
+ <property name="text">
+ <string>Export everything</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="checkAttrPhoto">
+ <property name="text">
+ <string>Do not export attributes (photo ids)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="checkAttrClean">
+ <property name="text">
+ <string comment="@option:radio Exports the smallest key possible. Maps to export-minimal option of gpg">Clean key</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>602</width>
+ <height>108</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>602</width>
- <height>91</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
- </customwidget>
+ <customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
+ <customwidget>
+ <class>KUrlRequester</class>
+ <extends>QFrame</extends>
+ <header>kurlrequester.h</header>
+ </customwidget>
</customwidgets>
<includes>
- <include location="local" >kpushbutton.h</include>
+ <include location="local">kpushbutton.h</include>
</includes>
<resources/>
<connections>
@@ -153,11 +160,11 @@
<receiver>destServer</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>72</x>
<y>69</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>95</x>
<y>106</y>
</hint>
@@ -169,11 +176,11 @@
<receiver>newFilename</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>39</x>
<y>133</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>48</x>
<y>159</y>
</hint>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/keyinfodialog.cpp new/kdeutils-4.7.3/kgpg/keyinfodialog.cpp
--- old/kdeutils-4.7.2/kgpg/keyinfodialog.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/keyinfodialog.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -140,6 +140,8 @@
connect(this, SIGNAL(applyClicked()), SLOT(slotApply()));
connect(keychange, SIGNAL(done(int)), SLOT(slotApplied(int)));
connect(m_disable, SIGNAL(toggled(bool)), this, SLOT(slotDisableKey(bool)));
+ connect(m_expirationbtn, SIGNAL(clicked()), this, SLOT(slotChangeDate()));
+ connect(m_password, SIGNAL(clicked()), this, SLOT(slotChangePass()));
displayKey();
adjustSize();
@@ -179,6 +181,7 @@
if (email.isEmpty()) {
m_email->setText(i18nc("no email address", "none"));
m_email->setUrl(QString());
+ m_email->setEnabled(false);
} else {
m_email->setText(QLatin1String( "<qt><b><" ) + email + QLatin1String( "></b></qt>" ));
m_email->setUrl(QLatin1String( "mailto:" ) + name + QLatin1Char( '<' ) + email + QLatin1Char( '>' ));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/keysmanager.cpp new/kdeutils-4.7.3/kgpg/keysmanager.cpp
--- old/kdeutils-4.7.2/kgpg/keysmanager.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/keysmanager.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2002 Jean-Baptiste Mardelle
* Copyright (C) 2007,2008,2009,2010,2011 Rolf Eike Beer
+ * Copyright (C) 2011 Luis Ángel Fernández Fernández
*/
/***************************************************************************
@@ -1493,7 +1494,7 @@
if (ndlist.count() == 1) {
sname = ndlist.at(0)->getEmail().section(QLatin1Char( '@' ), 0, 0).section(QLatin1Char( '.' ), 0, 0);
if (sname.isEmpty())
- sname = ndlist.at(0)->getName().section(QLatin1Char( ' ' ), 0, 0);
+ sname = ndlist.at(0)->getName().section(QLatin1Char(' '), 0, 0);
} else
sname = QLatin1String( "keyring" );
@@ -1505,12 +1506,6 @@
sname.append(QLatin1String( ".asc" ));
sname.prepend(QDir::homePath() + QLatin1Char( '/' ));
- KDialog *dial = new KDialog(this );
- dial->setCaption( i18n("Public Key Export") );
- dial->setButtons( KDialog::Ok | KDialog::Cancel );
- dial->setDefaultButton( KDialog::Ok );
- dial->setModal( true );
-
QStringList serverList(KGpgSettings::keyServers());
serverList.replaceInStrings(QRegExp( QLatin1String( " .*") ), QLatin1String( "" ) ); // Remove kde 3.5 (Default) tag.
if (!serverList.isEmpty()) {
@@ -1519,19 +1514,14 @@
serverList.prepend(defaultServer);
}
- KeyExport *page = new KeyExport(dial, serverList);
+ QPointer<KeyExport> page = new KeyExport(this, serverList);
- dial->setMainWidget(page);
page->newFilename->setUrl(sname);
- page->newFilename->setWindowTitle(i18n("Save File"));
- page->newFilename->setMode(KFile::File);
if (!m_online)
page->checkServer->setEnabled(false);
- page->show();
-
- if (dial->exec() == QDialog::Accepted) {
+ if (page->exec() == QDialog::Accepted) {
// export to file
QString exportAttr;
@@ -1577,7 +1567,7 @@
}
}
- delete dial;
+ delete page;
}
void KeysManager::slotExportFinished(int result)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/kgpg.cpp new/kdeutils-4.7.3/kgpg/kgpg.cpp
--- old/kdeutils-4.7.2/kgpg/kgpg.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/kgpg.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -76,6 +76,12 @@
if (KUrl::fromPath(gpgPath).directory(KUrl::AppendTrailingSlash) != (QDir::homePath() + QLatin1String( "/.gnupg/" )))
setenv("GNUPGHOME", KUrl::fromPath(gpgPath).directory(KUrl::AppendTrailingSlash).toAscii(), 1);
+ const QString gpgError = KgpgInterface::getGpgStartupError(KGpgSettings::gpgBinaryPath());
+ if (!gpgError.isEmpty()) {
+ KMessageBox::detailedError(0, i18n("GnuPG failed to start.<br />You must fix the GnuPG error first before running KGpg."), gpgError, i18n("GnuPG error"));
+ KApplication::quit();
+ }
+
s_keyManager = new KeysManager();
w = new KGpgExternalActions(s_keyManager, s_keyManager->getModel());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/kgpginterface.cpp new/kdeutils-4.7.3/kgpg/kgpginterface.cpp
--- old/kdeutils-4.7.2/kgpg/kgpginterface.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/kgpginterface.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -105,6 +105,25 @@
return QString();
}
+QString KgpgInterface::getGpgStartupError(const QString &binary)
+{
+ GPGProc process(0, binary);
+ process << QLatin1String( "--version" );
+ process.start();
+ process.waitForFinished(-1);
+
+ QString result;
+
+ while (process.hasLineStandardError()) {
+ QByteArray tmp;
+ process.readLineStandardError(&tmp);
+ tmp += '\n';
+ result += QString::fromUtf8(tmp);
+ }
+
+ return result;
+}
+
QString KgpgInterface::getGpgHome(const QString &binary)
{
// First try: if environment is set GnuPG will use that directory
@@ -406,6 +425,7 @@
if (isnew) {
QPointer<KNewPasswordDialog> dlg = new KNewPasswordDialog(widget);
dlg->setPrompt(text);
+ dlg->setAllowEmptyPasswords(false);
code = dlg->exec();
if (!dlg.isNull())
passphrase = dlg->password().toUtf8();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/kgpginterface.h new/kdeutils-4.7.3/kgpg/kgpginterface.h
--- old/kdeutils-4.7.2/kgpg/kgpginterface.h 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/kgpginterface.h 2011-10-28 09:53:29.000000000 +0200
@@ -120,6 +120,13 @@
*/
static int sendPassphrase(const QString &text, KProcess *process, const bool isnew = true, QWidget *widget = NULL);
+ /**
+ * @brief run GnuPG and check if it complains about anything
+ * @param binary the GnuPG binary to run
+ * @return the error message GnuPG gave out (if any)
+ */
+ static QString getGpgStartupError(const QString &binary);
+
private:
static QString getGpgProcessHome(const QString &binary);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/main.cpp new/kdeutils-4.7.3/kgpg/main.cpp
--- old/kdeutils-4.7.2/kgpg/main.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/main.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -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.6.1";
+static const char version[] = "2.6.2";
int main(int argc, char *argv[])
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/transactions/kgpgchangepass.cpp new/kdeutils-4.7.3/kgpg/transactions/kgpgchangepass.cpp
--- old/kdeutils-4.7.2/kgpg/transactions/kgpgchangepass.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/transactions/kgpgchangepass.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -68,9 +68,7 @@
if (askPassphrase(i18n("Enter old passphrase for <b>%1</b>", userIDs)))
setSuccess(TS_USER_ABORTED);
} else {
- if (sendPassphrase(i18n("<qt>Enter new passphrase for <b>%1</b><br />If you forget this passphrase all your encrypted files and messages will be inaccessible.</qt>", userIDs), true)) {
- setSuccess(TS_USER_ABORTED);
- }
+ askNewPassphrase(i18n("<qt>Enter new passphrase for <b>%1</b><br />If you forget this passphrase all your encrypted files and messages will be inaccessible.</qt>", userIDs));
}
} else if (line.contains(QLatin1String( "GET_" ))) {
setSuccess(TS_MSG_SEQUENCE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/transactions/kgpggeneratekey.cpp new/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.cpp
--- old/kdeutils-4.7.2/kgpg/transactions/kgpggeneratekey.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -100,7 +100,6 @@
keymessage.append("\nPassphrase: ");
write(keymessage, false);
- QApplication::restoreOverrideCursor();
QString passdlgmessage;
if (!m_email.isEmpty()) {
passdlgmessage = i18n("<p><b>Enter passphrase for %1 <%2></b>:<br />Passphrase should include non alphanumeric characters and random sequences.</p>", m_name, m_email);
@@ -108,11 +107,8 @@
passdlgmessage = i18n("<p><b>Enter passphrase for %1</b>:<br />Passphrase should include non alphanumeric characters and random sequences.</p>", m_name);
}
- if (sendPassphrase(passdlgmessage, true)) {
- setSuccess(TS_USER_ABORTED);
- }
- QApplication::setOverrideCursor(Qt::BusyCursor);
- write("%commit");
+ QApplication::restoreOverrideCursor();
+ askNewPassphrase(passdlgmessage);
}
bool
@@ -169,7 +165,32 @@
void
KGpgGenerateKey::finish()
{
- emit statusMessage(i18n("Key %1 generated", getFingerprint()));
+ switch (getSuccess()) {
+ case TS_BAD_PASSPHRASE:
+ emit statusMessage(i18n("Bad passphrase. Cannot generate a new key pair."));
+ break;
+ case TS_USER_ABORTED:
+ emit statusMessage(i18n("Aborted by the user. Cannot generate a new key pair."));
+ break;
+ case TS_INVALID_EMAIL:
+ emit statusMessage(i18n("The email address is not valid. Cannot generate a new key pair."));
+ break;
+ case TS_INVALID_NAME:
+ emit statusMessage(i18n("The name is not accepted by gpg. Cannot generate a new key pair."));
+ break;
+ case TS_OK:
+ emit statusMessage(i18n("Key %1 generated", getFingerprint()));
+ break;
+ default:
+ emit statusMessage(i18n("gpg process did not finish. Cannot generate a new key pair."));
+ }
+}
+
+void
+KGpgGenerateKey::newPasswordEntered()
+{
+ QApplication::setOverrideCursor(Qt::BusyCursor);
+ write("%commit");
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/transactions/kgpggeneratekey.h new/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.h
--- old/kdeutils-4.7.2/kgpg/transactions/kgpggeneratekey.h 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/transactions/kgpggeneratekey.h 2011-10-28 09:53:29.000000000 +0200
@@ -72,6 +72,7 @@
virtual void postStart();
virtual bool nextLine(const QString &line);
virtual void finish();
+ virtual void newPasswordEntered();
private:
QString m_name;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/transactions/kgpgtransaction.cpp new/kdeutils-4.7.3/kgpg/transactions/kgpgtransaction.cpp
--- old/kdeutils-4.7.2/kgpg/transactions/kgpgtransaction.cpp 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/transactions/kgpgtransaction.cpp 2011-10-28 09:53:29.000000000 +0200
@@ -18,6 +18,7 @@
#include <QWidget>
#include <KDebug>
+#include
#include <KLocale>
#include "gpgproc.h"
@@ -34,6 +35,7 @@
KGpgTransaction *m_parent;
GPGProc *m_process;
KGpgTransaction *m_inputTransaction;
+ KNewPasswordDialog *m_passwordDialog;
int m_success;
int m_tries;
QString m_description;
@@ -45,6 +47,8 @@
void slotProcessExited();
void slotProcessStarted();
void slotInputTransactionDone(int result);
+ void slotPasswordEntered(const QString &password);
+ void slotPasswordAborted();
QList m_argRefs;
bool m_inputProcessDone;
@@ -70,6 +74,7 @@
m_parent(parent),
m_process(new GPGProc()),
m_inputTransaction(NULL),
+ m_passwordDialog(NULL),
m_success(KGpgTransaction::TS_OK),
m_tries(3),
m_chainingAllowed(allowChaining),
@@ -82,6 +87,10 @@
KGpgTransactionPrivate::~KGpgTransactionPrivate()
{
+ if (m_passwordDialog) {
+ m_passwordDialog->close();
+ m_passwordDialog->deleteLater();
+ }
delete m_inputTransaction;
delete m_process;
}
@@ -180,6 +189,24 @@
}
void
+KGpgTransactionPrivate::slotPasswordEntered(const QString &password)
+{
+ sender()->deleteLater();
+ m_passwordDialog = NULL;
+ m_process->write(password.toUtf8() + '\n');
+ m_parent->newPasswordEntered();
+}
+
+void
+KGpgTransactionPrivate::slotPasswordAborted()
+{
+ sender()->deleteLater();
+ m_passwordDialog = NULL;
+ m_process->kill();
+ m_success = KGpgTransaction::TS_USER_ABORTED;
+}
+
+void
KGpgTransactionPrivate::write(const QByteArray &a)
{
m_process->write(a);
@@ -234,11 +261,17 @@
write(QByteArray::number(i));
}
-int
-KGpgTransaction::sendPassphrase(const QString &text, const bool isnew)
+void
+KGpgTransaction::askNewPassphrase(const QString& text)
{
emit statusMessage(i18n("Requesting Passphrase"));
- return KgpgInterface::sendPassphrase(text, d->m_process, isnew, qobject_cast(parent()));
+
+ d->m_passwordDialog = new KNewPasswordDialog(qobject_cast(parent()));
+ d->m_passwordDialog->setPrompt(text);
+ d->m_passwordDialog->setAllowEmptyPasswords(false);
+ connect(d->m_passwordDialog, SIGNAL(newPassword(QString)), SLOT(slotPasswordEntered(QString)));
+ connect(d->m_passwordDialog, SIGNAL(rejected()), SLOT(slotPasswordAborted()));
+ d->m_passwordDialog->show();
}
int
@@ -408,7 +441,8 @@
--d->m_tries;
- return sendPassphrase(passdlgmessage, false);
+ emit statusMessage(i18n("Requesting Passphrase"));
+ return KgpgInterface::sendPassphrase(passdlgmessage, d->m_process, false, qobject_cast(parent()));
}
void
@@ -472,9 +506,15 @@
return (d->m_inputTransaction != NULL);
}
-void KGpgTransaction::kill()
+void
+KGpgTransaction::kill()
{
d->m_process->kill();
}
+void
+KGpgTransaction::newPasswordEntered()
+{
+}
+
#include "kgpgtransaction.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/transactions/kgpgtransaction.h new/kdeutils-4.7.3/kgpg/transactions/kgpgtransaction.h
--- old/kdeutils-4.7.2/kgpg/transactions/kgpgtransaction.h 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/transactions/kgpgtransaction.h 2011-10-28 09:53:29.000000000 +0200
@@ -225,6 +225,15 @@
*/
virtual void finish();
/**
+ * @brief called when the user entered a new password
+ *
+ * This is called after askNewPassphrase() was called, the user has
+ * entered a new password and it was sent to the GnuPG process.
+ *
+ * The default implementation does nothing.
+ */
+ virtual void newPasswordEntered();
+ /**
* @brief set the description returned in getDescription()
* @param description the new description of this transaction
*/
@@ -249,21 +258,27 @@
Q_PRIVATE_SLOT(d, void slotProcessExited())
Q_PRIVATE_SLOT(d, void slotProcessStarted())
Q_PRIVATE_SLOT(d, void slotInputTransactionDone(int))
+ Q_PRIVATE_SLOT(d, void slotPasswordEntered(const QString &))
+ Q_PRIVATE_SLOT(d, void slotPasswordAborted())
protected:
/**
* @brief Ask user for passphrase and send it to gpg process.
*
- * If the gpg process asks for a passphrase for authorization this
- * function will do all necessary steps for you: ask the user for the
- * password and write it to the gpg process. If the password is wrong
- * the user is prompted again for the correct password.
+ * If the gpg process asks for a new passphrase this function will do
+ * all necessary steps for you: ask the user for the password and write
+ * it to the gpg process. If the password is wrong the user is prompted
+ * again for the correct password. If the user aborts the password
+ * entry the gpg process will be killed and the transaction result will
+ * be set to TS_USER_ABORTED.
*
- * @return 0 if password was correct
+ * In contrast to sendPassphrase() this function will not block, but
+ * handle everything using signals and slots.
*
* @see KgpgInterface::sendPassphrase
+ * @see sendPassphrase
*/
- int sendPassphrase(const QString &text, const bool isnew = false);
+ void askNewPassphrase(const QString &text);
/**
* @brief get the success value that will be returned with the done signal
@@ -383,7 +398,6 @@
* and the number of tries left.
*/
bool askPassphrase(const QString &message = QString());
-
};
#endif // KGPGTRANSACTION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kgpg/viewdecrypted.desktop new/kdeutils-4.7.3/kgpg/viewdecrypted.desktop
--- old/kdeutils-4.7.2/kgpg/viewdecrypted.desktop 2011-10-04 20:54:22.000000000 +0200
+++ new/kdeutils-4.7.3/kgpg/viewdecrypted.desktop 2011-10-28 09:53:29.000000000 +0200
@@ -25,7 +25,7 @@
Name[ga]=Féach ar an gcomhad díchriptithe
Name[gl]=Ver o ficheiro descifrado
Name[hr]=Pogledaj datoteku dešifrirano
-Name[hu]=Megtekintés dekódolva
+Name[hu]=Visszafejtett fájl megjelenítése
Name[id]=Menampilkan berkas yang dienkripsi
Name[it]=Visualizza file decifrato
Name[ja]=復号されたファイルを表示
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kremotecontrol/dataengine/plasma-engine-kremotecontrol.desktop new/kdeutils-4.7.3/kremotecontrol/dataengine/plasma-engine-kremotecontrol.desktop
--- old/kdeutils-4.7.2/kremotecontrol/dataengine/plasma-engine-kremotecontrol.desktop 2011-10-04 20:54:23.000000000 +0200
+++ new/kdeutils-4.7.3/kremotecontrol/dataengine/plasma-engine-kremotecontrol.desktop 2011-10-28 09:53:31.000000000 +0200
@@ -15,6 +15,7 @@
Name[fr]=Moteur des données de contrôle à distance
Name[ga]=Inneall Sonraí Cianrialtáin
Name[hr]=Podatkovni mehanizam za udaljenu kontrolu
+Name[hu]=Távirányító adatmodul
Name[id]=Mesin Data Kendali Jarak Jauh
Name[it]=Motore dati telecomando
Name[ja]=Remote Control のデータエンジン
@@ -62,6 +63,7 @@
Comment[fr]=Moteur de données pour kremotecontrol
Comment[ga]=Inneall sonraí le haghaidh kremotecontrol
Comment[hr]=Podatkovni mehanizam za kremotecontrol
+Comment[hu]=Adatmodul a kremotecontrolhoz
Comment[id]=Data mesin untuk kremotecontrol
Comment[it]=Motore dati per telecomandi
Comment[ja]=kremotecontrol のためのデータエンジン
Files old/kdeutils-4.7.2/kremotecontrol/doc/index.cache.bz2 and new/kdeutils-4.7.3/kremotecontrol/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kremotecontrol/kded/kremotecontroldaemon.desktop new/kdeutils-4.7.3/kremotecontrol/kded/kremotecontroldaemon.desktop
--- old/kdeutils-4.7.2/kremotecontrol/kded/kremotecontroldaemon.desktop 2011-10-04 20:54:23.000000000 +0200
+++ new/kdeutils-4.7.3/kremotecontrol/kded/kremotecontroldaemon.desktop 2011-10-28 09:53:31.000000000 +0200
@@ -16,6 +16,7 @@
Name[fr]=Démon pour K Remote Control
Name[ga]=Deamhan Cianrialtáin K
Name[hr]=Servis K Remote Control
+Name[hu]=K Remote Control Daemon
Name[id]=Daemon K Remote Control
Name[it]=Demone telecomandi
Name[ja]=K Remote Control デーモン
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kremotecontrol/kded/kremotecontroldaemon.notifyrc new/kdeutils-4.7.3/kremotecontrol/kded/kremotecontroldaemon.notifyrc
--- old/kdeutils-4.7.2/kremotecontrol/kded/kremotecontroldaemon.notifyrc 2011-10-04 20:54:23.000000000 +0200
+++ new/kdeutils-4.7.3/kremotecontrol/kded/kremotecontroldaemon.notifyrc 2011-10-28 09:53:31.000000000 +0200
@@ -17,6 +17,7 @@
Comment[fr]=Démon KRemoteControl
Comment[ga]=Deamhan KRemoteControl
Comment[hr]=Servis KRemoteControl
+Comment[hu]=KRemoteControl démon
Comment[id]=Daemon KRemoteControl
Comment[it]=Demone telecomandi
Comment[ja]=KRemoteControl デーモン
@@ -65,6 +66,7 @@
Name[fr]=Notification KRemoteControl
Name[ga]=Fógairt KRemoteControl
Name[hr]=KRemoteControl-ova obavijest
+Name[hu]=KRemoteControl értesítés
Name[id]=Notifikasi KremoteControl
Name[it]=Notifica telecomandi
Name[kk]=KRemoteControl құлақтандыруы
@@ -110,6 +112,7 @@
Comment[fr]=Évènement de notification globale KRemoteControl
Comment[ga]=Teagmhas comhchoiteann fógartha KRemoteControl
Comment[hr]=Globalni obavještajni događaj KRemoteControl
+Comment[hu]=KRemoteControl globális értesítő esemény
Comment[id]=Notifikasi global KremoteControl
Comment[it]=Evento di notifica globale telecomandi
Comment[kk]=KRemoteControl жалпы құлақтандыру оқиғасы
@@ -159,6 +162,7 @@
Name[fr]=Évènement d'inversion de mode
Name[ga]=Teagmhas athraithe móid
Name[hr]=Događaj zamjene načina
+Name[hu]=Módváltó esemény
Name[it]=Evento cambio modalità
Name[kk]=Режім ауысу оқиғасы
Name[km]=របៀបប្ដូរព្រឹត្តិការណ៍
@@ -307,6 +311,7 @@
Comment[fr]=KRemoteControl a démarré une application
Comment[ga]=Thosaigh KRemoteControl feidhmchlár
Comment[hr]=KRemoteControl je pokrenuo aplikaciju
+Comment[hu]=A KRemoteControl elindított egy alkalmazást
Comment[id]=KRemoteControl telah menjalankan sebuah aplikasi
Comment[it]=Il demone telecomandi ha attivato un'applicazione
Comment[kk]=KRemoteControl қолданбаны жекті
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kremotecontrol/krcdnotifieritem/krcdnotifieritem.desktop new/kdeutils-4.7.3/kremotecontrol/krcdnotifieritem/krcdnotifieritem.desktop
--- old/kdeutils-4.7.2/kremotecontrol/krcdnotifieritem/krcdnotifieritem.desktop 2011-10-04 20:54:23.000000000 +0200
+++ new/kdeutils-4.7.3/kremotecontrol/krcdnotifieritem/krcdnotifieritem.desktop 2011-10-28 09:53:31.000000000 +0200
@@ -16,6 +16,7 @@
Name[fr]=Élément de l'outil de notification KRemoteControl
Name[ga]=Mír Fhógartha KRemoteControl
Name[hr]=Stavka KRemoteControl-ovog glasnika
+Name[hu]=KRemoteControl értesítő elem
Name[id]=Item Notifikasi KRemoteControl
Name[it]=Elemento di notifica telecomandi
Name[kk]=KRemoteControl құлақтандыру бабы
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kremotecontrol/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop new/kdeutils-4.7.3/kremotecontrol/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop
--- old/kdeutils-4.7.2/kremotecontrol/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop 2011-10-04 20:54:23.000000000 +0200
+++ new/kdeutils-4.7.3/kremotecontrol/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop 2011-10-28 09:53:31.000000000 +0200
@@ -17,6 +17,7 @@
Name[fi]=Lirc
Name[fr]=Lirc
Name[hr]=Lirc
+Name[hu]=Lirc
Name[it]=Lirc
Name[kk]=Lirc
Name[km]=Lirc
@@ -55,6 +56,7 @@
Comment[fi]=Linuxin infrapunalla toimivien kauko-ohjainten ohjaus
Comment[fr]=Contrôle à distance infrarouge pour Linux
Comment[hr]=Linuxovo infracrveno daljinsko upravljanje
+Comment[hu]=Linux Infrared Remote Control
Comment[it]=Telecomandi ad infrarosso per Linux
Comment[kk]=Linux инфрақызыл қашықтан басқаруы
Comment[km]=វត្ថុបញ្ជាពីចម្ងាយអាំងហ្វ្រារបស់លីនុច
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kremotecontrol/libkremotecontrol/kremotecontrolmanager.desktop new/kdeutils-4.7.3/kremotecontrol/libkremotecontrol/kremotecontrolmanager.desktop
--- old/kdeutils-4.7.2/kremotecontrol/libkremotecontrol/kremotecontrolmanager.desktop 2011-10-04 20:54:23.000000000 +0200
+++ new/kdeutils-4.7.3/kremotecontrol/libkremotecontrol/kremotecontrolmanager.desktop 2011-10-28 09:53:31.000000000 +0200
@@ -5,7 +5,7 @@
Comment[bs]=Pozadina daljinskih upravljača
Comment[ca]=Dorsal de gestió de control remot
Comment[ca@valencia]=Dorsal de gestió de control remot
-Comment[cs]=Backend pro vzdálenou správu
+Comment[cs]=Podpůrná vrstva pro vzdálenou správu
Comment[da]=Motor til håndtering af fjernbetjening
Comment[de]=Treiber für Fernbedienungen
Comment[es]=Motor de gestión de mandos a distancia
@@ -14,6 +14,7 @@
Comment[fi]=Kauko-ohjainten hallintataustaosa
Comment[fr]=Moteur de gestion du contrôle à distance
Comment[hr]=Podrška za upravljanje na daljinu
+Comment[hu]=Távirányító-kezelő modul
Comment[it]=Backend telecomandi
Comment[kk]=Қашықтан басқарғыштың басқару тетігі
Comment[km]=កម្មវិធីផ្នែកខាងក្រោយគ្រប់គ្រងការបញ្ជាពីចម្ងាយ
Files old/kdeutils-4.7.2/ktimer/doc/index.cache.bz2 and new/kdeutils-4.7.3/ktimer/doc/index.cache.bz2 differ
Files old/kdeutils-4.7.2/kwallet/doc/index.cache.bz2 and new/kdeutils-4.7.3/kwallet/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kwallet/konfigurator/kwalletconfig.desktop new/kdeutils-4.7.3/kwallet/konfigurator/kwalletconfig.desktop
--- old/kdeutils-4.7.2/kwallet/konfigurator/kwalletconfig.desktop 2011-10-04 20:54:24.000000000 +0200
+++ new/kdeutils-4.7.3/kwallet/konfigurator/kwalletconfig.desktop 2011-10-28 09:53:34.000000000 +0200
@@ -35,7 +35,7 @@
Name[he]=KDE Wallet
Name[hne]=केडीई वालेट
Name[hr]=KDE-ov novčanik
-Name[hu]=Digitális noteszek
+Name[hu]=KDE Wallet
Name[id]=Dompet KDE
Name[is]=KDE veskið
Name[it]=Portafogli di KDE
@@ -137,7 +137,7 @@
Comment[ta]=கேடிஇ வாலட் வடிவமைப்பு
Comment[tg]=KDE Танзими Ҳамён
Comment[th]=ปรับแต่งกระเป๋าคุมข้อมูลของ KDE
-Comment[tr]=KDE Cüzdan Ayarı
+Comment[tr]=KDE Cüzdan Yönetimi
Comment[uk]=Налаштування KWallet
Comment[uz]=KDE qopchiq xizmatini moslash
Comment[uz@cyrillic]=KDE қопчиқ хизматини мослаш
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/kwallet/kwalletmanager.desktop new/kdeutils-4.7.3/kwallet/kwalletmanager.desktop
--- old/kdeutils-4.7.2/kwallet/kwalletmanager.desktop 2011-10-04 20:54:25.000000000 +0200
+++ new/kdeutils-4.7.3/kwallet/kwalletmanager.desktop 2011-10-28 09:53:35.000000000 +0200
@@ -50,6 +50,7 @@
Name[sv]=Hanteringsverktyg för plånbok
Name[th]=จัดการกระเป๋าคุมข้อมูล-K
Name[tr]=KWallet Yönetim Aracı
+Name[ug]=KWalletManager
Name[uk]=KWalletManager
Name[x-test]=xxKWalletManagerxx
Name[zh_CN]=KWalletManager
@@ -104,7 +105,7 @@
GenericName[sr@latin]=Alatka za upravljanje novčanicima
GenericName[sv]=Hanteringsverktyg för plånbok
GenericName[th]=เครื่องมือจัดการกระเป๋าคุมข้อมูล
-GenericName[tr]=KWallet Yönetim Aracı
+GenericName[tr]=Cüzdan Yönetim Aracı
GenericName[ug]=ھەميان باشقۇرۇش قورالى
GenericName[uk]=Засіб керування торбинками
GenericName[x-test]=xxWallet Management Toolxx
Files old/kdeutils-4.7.2/printer-applet/doc/index.cache.bz2 and new/kdeutils-4.7.3/printer-applet/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/superkaramba/plasma/plasma-package-superkaramba.desktop new/kdeutils-4.7.3/superkaramba/plasma/plasma-package-superkaramba.desktop
--- old/kdeutils-4.7.2/superkaramba/plasma/plasma-package-superkaramba.desktop 2011-10-04 20:54:26.000000000 +0200
+++ new/kdeutils-4.7.3/superkaramba/plasma/plasma-package-superkaramba.desktop 2011-10-28 09:53:38.000000000 +0200
@@ -20,7 +20,7 @@
Name[gl]=Ficheiros de tema de SuperKaramba
Name[hne]=सुपरकराम्बा प्रसंग फाइल
Name[hr]=Datoteke teme SuperKaramba
-Name[hu]=SuperKaramba-témafájlok
+Name[hu]=SuperKaramba témafájlok
Name[id]=Berkas Tema SuperKaramba
Name[it]=File di tema SuperKaramba
Name[ja]=SuperKaramba テーマファイル
@@ -74,7 +74,7 @@
Comment[gl]=Temas de escritorio de Karamba
Comment[hne]=कराम्बा डेस्कटाप प्रसंग
Comment[hr]=Teme radne površine Karamba
-Comment[hu]=Karamba-témák
+Comment[hu]=Karamba témák
Comment[id]=Tema Desktop Karamba
Comment[it]=Temi desktop Karamba
Comment[ja]=Karamba デスクトップテーマ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop new/kdeutils-4.7.3/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop
--- old/kdeutils-4.7.2/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop 2011-10-04 20:54:26.000000000 +0200
+++ new/kdeutils-4.7.3/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop 2011-10-28 09:53:38.000000000 +0200
@@ -83,7 +83,7 @@
Comment[gl]=Tema de escritorio de Karamba
Comment[hne]=कराम्बा डेस्कटाप प्रसंग
Comment[hr]=Tema radne površine Karamba
-Comment[hu]=Karamba-téma
+Comment[hu]=Karamba téma
Comment[id]=Tema Desktop Karamba
Comment[it]=Tema desktop Karamba
Comment[ja]=Karamba のデスクトップテーマ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/superkaramba/plasma/plasma-skapplet-default.desktop new/kdeutils-4.7.3/superkaramba/plasma/plasma-skapplet-default.desktop
--- old/kdeutils-4.7.2/superkaramba/plasma/plasma-skapplet-default.desktop 2011-10-04 20:54:26.000000000 +0200
+++ new/kdeutils-4.7.3/superkaramba/plasma/plasma-skapplet-default.desktop 2011-10-28 09:53:38.000000000 +0200
@@ -92,7 +92,7 @@
Comment[kk]=SuperKaramba Plasma апплеті
Comment[km]=អាប់ភ្លេតប្លាស្មារបស់ SuperKaramba
Comment[ko]=SuperKaramba Plasma 애플릿
-Comment[lt]=Superkaramba plazma programėlė
+Comment[lt]=SuperKaramba plazma programėlė
Comment[lv]=SuperKaramba Plasma sīklietotne
Comment[nb]=Superkaramba plasma-miniprogram
Comment[nds]=SuperKaramba-Lüttprogramm för Plasma
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/superkaramba/src/superkaramba.desktop new/kdeutils-4.7.3/superkaramba/src/superkaramba.desktop
--- old/kdeutils-4.7.2/superkaramba/src/superkaramba.desktop 2011-10-04 20:54:26.000000000 +0200
+++ new/kdeutils-4.7.3/superkaramba/src/superkaramba.desktop 2011-10-28 09:53:38.000000000 +0200
@@ -149,7 +149,7 @@
GenericName[he]=יישומונים על שולחן העבודה
GenericName[hne]=डेस्कटाप विजेट्स
GenericName[hr]=Widgeti radne površine
-GenericName[hu]=Asztali grafikus elemek
+GenericName[hu]=Asztali widgetek
GenericName[id]=Widget Desktop
GenericName[is]=Skjáborðshlutir
GenericName[it]=Elementi desktop
Files old/kdeutils-4.7.2/sweeper/doc/index.cache.bz2 and new/kdeutils-4.7.3/sweeper/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.7.2/sweeper/sweeper.desktop new/kdeutils-4.7.3/sweeper/sweeper.desktop
--- old/kdeutils-4.7.2/sweeper/sweeper.desktop 2011-10-04 20:54:27.000000000 +0200
+++ new/kdeutils-4.7.3/sweeper/sweeper.desktop 2011-10-28 09:53:39.000000000 +0200
@@ -29,7 +29,7 @@
Name[gl]=Sweeper
Name[hne]=स्वीपर
Name[hr]=Sweeper
-Name[hu]=Tisztító
+Name[hu]=Sweeper
Name[id]=Sweeper
Name[it]=Spazzino
Name[ja]=Sweeper
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org