Hello community, here is the log from the commit of package kdeutils4 for openSUSE:Factory checked in at Tue Aug 4 23:31:38 CEST 2009. -------- --- KDE/kdeutils4/kdeutils4.changes 2009-07-21 22:39:15.000000000 +0200 +++ kdeutils4/kdeutils4.changes 2009-07-29 18:12:39.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 18:12:33 CEST 2009 - dmueller@suse.de + +- update to 4.3.0 + * see http://kde.org/announcements/4.3 for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdeutils-4.2.98.tar.bz2 New: ---- kdeutils-4.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.BYMSX8/_old 2009-08-04 23:30:41.000000000 +0200 +++ /var/tmp/diff_new_pack.BYMSX8/_new 2009-08-04 23:30:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeutils4 (Version 4.2.98) +# spec file for package kdeutils4 (Version 4.3.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,7 +36,7 @@ Group: Productivity/Other Summary: Base Package of KDE Utility Programs Url: http://www.kde.org -Version: 4.2.98 +Version: 4.3.0 Release: 1 Source0: kdeutils-%version.tar.bz2 Patch: 4_3_BRANCH.diff ++++++ kdeutils-4.2.98.tar.bz2 -> kdeutils-4.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/app/ark_addtoservicemenu.desktop new/kdeutils-4.3.0/ark/app/ark_addtoservicemenu.desktop --- old/kdeutils-4.2.98/ark/app/ark_addtoservicemenu.desktop 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/ark/app/ark_addtoservicemenu.desktop 2009-07-29 13:12:56.000000000 +0200 @@ -57,6 +57,7 @@ Name[cs]=Sem Name[da]=Her Name[de]=Hier +Name[el]=Εδώ Name[es]=Aquí Name[et]=Siia Name[is]=Hér @@ -92,6 +93,7 @@ Name[cs]=Jako ZIP archív Name[da]=Som ZIP-arkiv Name[de]=Als ZIP-Archiv +Name[el]=Αρχειοθήκη ZIP Name[es]=Como archivo comprimido ZIP Name[et]=ZIP-arhiivina Name[fr]=En tant qu'archive ZIP @@ -128,6 +130,7 @@ Name[cs]=Jako RAR archív Name[da]=Som RAR-arkiv Name[de]=Als RAR-Archiv +Name[el]=Αρχειοθήκη RAR Name[es]=Como archivo comprimido RAR Name[et]=RAR-arhiivina Name[fr]=En tant qu'archive RAR @@ -164,6 +167,7 @@ Name[cs]=Jako ZIP/TAR archív Name[da]=Som ZIP-/TAR-arkiv Name[de]=Als ZIP/TAR-Archiv +Name[el]=Σε αρχειοθήκη ZIP/TAR Name[es]=Como archivo comprimido ZIP/TAR Name[et]=ZIP/TAR-arhiivina Name[fr]=En tant qu'archive ZIP/RAR @@ -200,6 +204,7 @@ Name[cs]=Zkomprimovat do... Name[da]=Komprimér til... Name[de]=Komprimieren nach ... +Name[el]=Συμπίεση σε... Name[es]=Comprimir en... Name[et]=Paki asukohta... Name[fr]=Compresser vers... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/app/ark_dndextract.desktop new/kdeutils-4.3.0/ark/app/ark_dndextract.desktop --- old/kdeutils-4.2.98/ark/app/ark_dndextract.desktop 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/ark/app/ark_dndextract.desktop 2009-07-29 13:12:56.000000000 +0200 @@ -8,6 +8,7 @@ Name[cs]=Rozbalit Arkem sem Name[da]=Pak ud med Ark her Name[de]=Ark - Hierher auspacken +Name[el]=Εξαγωγή Ark εδώ Name[es]=Extraer aquí con Ark Name[et]=Paki siia lahti Name[fr]=Extraire un Ark ici diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/app/ark_servicemenu.desktop new/kdeutils-4.3.0/ark/app/ark_servicemenu.desktop --- old/kdeutils-4.2.98/ark/app/ark_servicemenu.desktop 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/ark/app/ark_servicemenu.desktop 2009-07-29 13:12:56.000000000 +0200 @@ -15,6 +15,7 @@ Name[cs]=Rozbalit archív sem Name[da]=Udpak arkiv her Name[de]=Archiv hierher auspacken +Name[el]=Εξαγωγή αρχειοθήκης εδώ Name[es]=Extraer archivo comprimido aquí Name[et]=Paki arhiiv siia lahti Name[fr]=Extraire l'archive ici @@ -51,6 +52,7 @@ Name[cs]=Rozbalit archív do... Name[da]=Udpak arkiv til... Name[de]=Archiv auspacken nach... +Name[el]=Εξαγωγή αρχειοθήκης σε... Name[es]=Extraer archivo comprimido en... Name[et]=Paki arhiiv lahti... Name[fr]=Extraire l'archive vers... @@ -87,6 +89,7 @@ Name[cs]=Rozbalit archív sem, automaticky detekovat podsložku Name[da]=Udpak arkiv her og find automatisk undermappe Name[de]=Archiv hierher auspacken, Unterordner selbstständig ermitteln +Name[el]=Εξαγωγή αρχειοθήκης εδώ, αυτόματη επιλογή υποφακέλου Name[es]=Extraer archivo comprimido aquí, autodetectar subcarpeta Name[et]=Paki arhiiv siia lahti, tuvasta automaatselt alamkataloog Name[fr]=Extraire l'archive ici, auto-détecter les sous-dossiers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/app/main.cpp new/kdeutils-4.3.0/ark/app/main.cpp --- old/kdeutils-4.2.98/ark/app/main.cpp 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/ark/app/main.cpp 2009-07-29 13:12:56.000000000 +0200 @@ -161,14 +161,8 @@ BatchExtract *batchJob = new BatchExtract; application.connect(batchJob, SIGNAL(result(KJob*)), SLOT(quit())); - bool hasValidJobs = true; for (int i = 0; i < args->count(); ++i) { - hasValidJobs = batchJob->addInput(args->url(i)); - } - - if (!hasValidJobs) { - delete batchJob; - return -1; + batchJob->addInput(args->url(i)); } if (args->isSet("autosubfolder")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/kerfuffle/batchextract.cpp new/kdeutils-4.3.0/ark/kerfuffle/batchextract.cpp --- old/kdeutils-4.2.98/ark/kerfuffle/batchextract.cpp 2009-07-21 17:23:08.000000000 +0200 +++ new/kdeutils-4.3.0/ark/kerfuffle/batchextract.cpp 2009-07-29 13:12:56.000000000 +0200 @@ -52,8 +52,9 @@ BatchExtract::~BatchExtract() { - kDebug(1601) << "Dying"; - KIO::getJobTracker()->unregisterJob(this); + if (!m_inputs.isEmpty()) { + KIO::getJobTracker()->unregisterJob(this); + } } void BatchExtract::addExtraction(Kerfuffle::Archive* archive, bool preservePaths, QString destinationFolder) @@ -108,9 +109,11 @@ void BatchExtract::start() { - kDebug(1601); - - Q_ASSERT(hasSubjobs()); + // If none of the archives could be loaded, there is no subjob to run + if (m_inputs.isEmpty()) { + emitResult(); + return; + } if (!m_subfolder.isEmpty()) { kDebug(1601) << "Creating subfolder" << m_subfolder; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/part/archivemodel.cpp new/kdeutils-4.3.0/ark/part/archivemodel.cpp --- old/kdeutils-4.2.98/ark/part/archivemodel.cpp 2009-06-17 22:05:58.000000000 +0200 +++ new/kdeutils-4.3.0/ark/part/archivemodel.cpp 2009-07-29 13:12:56.000000000 +0200 @@ -519,6 +519,18 @@ return true; } +// For a rationale, see bug #194241 +QString ArchiveModel::cleanFileName(const QString& fileName) +{ + QString cleanName(fileName); + + if (cleanName.startsWith(QLatin1String("./"))) { + cleanName.remove(0, 2); + } + + return cleanName; +} + ArchiveDirNode* ArchiveModel::parentFor(const ArchiveEntry& entry) { QStringList pieces = entry[ FileName ].toString().split('/', QString::SkipEmptyParts); @@ -592,7 +604,13 @@ { // TODO: Do something kDebug(1601) << "Removed node at path " << path; - ArchiveNode *entry = m_rootNode->findByPath(path.split('/', QString::SkipEmptyParts)); + + QString entryFileName(cleanFileName(path)); + if (entryFileName.isEmpty()) { + return; + } + + ArchiveNode *entry = m_rootNode->findByPath(entryFileName.split('/', QString::SkipEmptyParts)); if (entry) { ArchiveDirNode *parent = entry->parent(); QModelIndex index = indexForNode(entry); @@ -672,16 +690,11 @@ ArchiveEntry entry = receivedEntry; //#194241: Filenames such as "./file" should be displayed as "file" - QString entryFileName(entry[FileName].toString()); - if (entryFileName.startsWith(QLatin1String("./"))) { - if (entryFileName == "./") // Stop here, this would create an empty entry - return; - - if (!entry.contains(InternalID)) - kDebug(1601) << "Warning, there is no internalID"; - - entry[FileName] = entryFileName.remove(0, 2); + QString entryFileName = cleanFileName(entry[FileName].toString()); + if (entryFileName.isEmpty()) { // The entry contains only "./" + return; } + entry[FileName] = entryFileName; /// 1. Skip already created nodes if (m_rootNode) { @@ -854,3 +867,5 @@ //kDebug(1601) << "Removed entry " << entry[FileName].toString(); } } + +#include "archivemodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/part/archivemodel.h new/kdeutils-4.3.0/ark/part/archivemodel.h --- old/kdeutils-4.2.98/ark/part/archivemodel.h 2009-06-17 22:05:58.000000000 +0200 +++ new/kdeutils-4.3.0/ark/part/archivemodel.h 2009-07-29 13:12:56.000000000 +0200 @@ -89,6 +89,17 @@ void slotCleanupEmptyDirs(); private: + /** + * Strips file names that start with './'. + * + * For more information, see bug 194241. + * + * @param fileName The file name that will be stripped. + * + * @return @p fileName without the leading './' + */ + QString cleanFileName(const QString& fileName); + ArchiveDirNode* parentFor(const ArchiveEntry& entry); QModelIndex indexForNode(ArchiveNode *node); static bool compareAscending(const QModelIndex& a, const QModelIndex& b); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/part/infopanel.h new/kdeutils-4.3.0/ark/part/infopanel.h --- old/kdeutils-4.2.98/ark/part/infopanel.h 2009-06-17 22:05:58.000000000 +0200 +++ new/kdeutils-4.3.0/ark/part/infopanel.h 2009-07-29 13:12:56.000000000 +0200 @@ -32,7 +32,7 @@ Q_OBJECT public: explicit InfoPanel(ArchiveModel *model, QWidget *parent = 0); - ~InfoPanel(); + virtual ~InfoPanel(); void setIndex(const QModelIndex &); void setIndexes(const QModelIndexList &list); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/plugins/clizipplugin/kerfuffle_clizip.desktop new/kdeutils-4.3.0/ark/plugins/clizipplugin/kerfuffle_clizip.desktop --- old/kdeutils-4.2.98/ark/plugins/clizipplugin/kerfuffle_clizip.desktop 2009-07-21 17:23:07.000000000 +0200 +++ new/kdeutils-4.3.0/ark/plugins/clizipplugin/kerfuffle_clizip.desktop 2009-07-29 13:12:56.000000000 +0200 @@ -17,6 +17,7 @@ Name[cs]=Modul pro ZIP archív Name[da]=ZIP arkiv-plugin Name[de]=ZIP-Archiv-Modul +Name[el]=πρόσθετο αρχειοθήκης ZIP Name[es]=Complemento de archivo comprimido ZIP Name[et]=ZIP-arhiivi plugin Name[fr]=Module d'archive ZIP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/ark/plugins/libarchive/libarchivehandler.cpp new/kdeutils-4.3.0/ark/plugins/libarchive/libarchivehandler.cpp --- old/kdeutils-4.2.98/ark/plugins/libarchive/libarchivehandler.cpp 2009-06-23 13:14:20.000000000 +0200 +++ new/kdeutils-4.3.0/ark/plugins/libarchive/libarchivehandler.cpp 2009-07-29 13:12:56.000000000 +0200 @@ -161,7 +161,7 @@ retry: const bool entryIsDir = S_ISDIR(archive_entry_mode(entry)); - //we skip directories of not preserving paths + //we skip directories if not preserving paths if (!preservePaths && entryIsDir) { archive_read_data_skip(arch); continue; @@ -240,15 +240,30 @@ } } + //if there is an already existing directory: + if (entryIsDir && entryFI.exists()) { + if (entryFI.isWritable()) { + kDebug(1601) << "Warning, existing, but writable dir"; + } else { + kDebug(1601) << "Warning, existing, but non-writable dir. skipping"; + archive_entry_clear(entry); + archive_read_data_skip(arch); + continue; + } + } + + int header_response; kDebug(1601) << "Writing " << fileWithoutPath << " to " << archive_entry_pathname(entry); if ((header_response = archive_write_header(writer, entry)) == ARCHIVE_OK) //if the whole archive is extracted and the total filesize is //available, we use partial progress copyData(arch, writer, (extractAll && m_extractedFilesSize)); - else { + else if (header_response == ARCHIVE_WARN) { + kDebug() << "Warning while writing " << entryName; + } else { kDebug(1601) << "Writing header failed with error code " << header_response - << "While attempting to write " << fileWithoutPath; + << "While attempting to write " << entryName; } //if we only partially extract the archive and the number of Files old/kdeutils-4.2.98/doc/ark/index.cache.bz2 and new/kdeutils-4.3.0/doc/ark/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kcalc/index.cache.bz2 and new/kdeutils-4.3.0/doc/kcalc/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kcharselect/index.cache.bz2 and new/kdeutils-4.3.0/doc/kcharselect/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kcontrol/blockdevices/index.cache.bz2 and new/kdeutils-4.3.0/doc/kcontrol/blockdevices/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kdelirc/irkick/index.cache.bz2 and new/kdeutils-4.3.0/doc/kdelirc/irkick/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kdelirc/kcmlirc/index.cache.bz2 and new/kdeutils-4.3.0/doc/kdelirc/kcmlirc/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kdf/index.cache.bz2 and new/kdeutils-4.3.0/doc/kdf/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kfloppy/index.cache.bz2 and new/kdeutils-4.3.0/doc/kfloppy/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kgpg/index.cache.bz2 and new/kdeutils-4.3.0/doc/kgpg/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/ktimer/index.cache.bz2 and new/kdeutils-4.3.0/doc/ktimer/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/kwallet/index.cache.bz2 and new/kdeutils-4.3.0/doc/kwallet/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/okteta/index.cache.bz2 and new/kdeutils-4.3.0/doc/okteta/index.cache.bz2 differ Files old/kdeutils-4.2.98/doc/superkaramba/index.cache.bz2 and new/kdeutils-4.3.0/doc/superkaramba/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/kdelirc/irkick/irkick.desktop new/kdeutils-4.3.0/kdelirc/irkick/irkick.desktop --- old/kdeutils-4.2.98/kdelirc/irkick/irkick.desktop 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/kdelirc/irkick/irkick.desktop 2009-07-29 13:12:56.000000000 +0200 @@ -12,6 +12,7 @@ GenericName[cy]=Gweinydd LIRC KDE GenericName[da]=KDE LIRC-server GenericName[de]=KDE-LIRC-Server +GenericName[el]=Εξυπηρετής KDE LIRC GenericName[eo]=KDE LIRC Servilo GenericName[es]=Servidor LIRC de KDE GenericName[et]=KDE LIRC server @@ -67,6 +68,7 @@ Comment[cy]=Gweinydd rheolydd pell isgoch Linux KDE Comment[da]=KDE server til Linux infrarød fjernbetjening. Comment[de]=Linux-Infrarot-Fernsteuerungsserver für KDE. +Comment[el]=KDE Linux εξυπηρετητής τηλεχειριστηρίου υπερύθρων Comment[es]=Servidor de mando a distancia por infrarrojos de Linux KDE. Comment[et]=KDE Linuxi infrapuna kaugjuhtimise server. Comment[eu]=KDE Linux infrasare urruneko aginte zerbitzaria. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/kdelirc/irkick/irkick.notifyrc new/kdeutils-4.3.0/kdelirc/irkick/irkick.notifyrc --- old/kdeutils-4.2.98/kdelirc/irkick/irkick.notifyrc 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/kdelirc/irkick/irkick.notifyrc 2009-07-29 13:12:56.000000000 +0200 @@ -15,6 +15,7 @@ Name[cs]=Oznámení Irkick Name[da]=IRKick-bekendtgørelse Name[de]=Irkick-Hinweis +Name[el]=Ειδοποίηση irkick Name[es]=Notificación de Irkick Name[et]=Irkicki märguanne Name[fr]=Notification Irkick @@ -45,6 +46,7 @@ Comment[ca]=Esdeveniment de notificació global de l'Irkick Comment[da]=IRKick global bekendtgørelseshændelse Comment[de]=Globales Hinweis-Ereignis in Irkick +Comment[el]=Irkick γεγονός καθολικής ειδοποίησης Comment[es]=Evento de notificación global de Irkick Comment[et]=Irkick globaalne märguandesündmus Comment[fr]=Évènement de notification globale Irkick @@ -79,6 +81,7 @@ Name[cs]=Událost režimu Name[da]=Tilstandshændelse Name[de]=Modus-Ereignis +Name[el]=Γεγονός λειτουργίας Name[es]=Evento de modo Name[et]=Režiimi sündmus Name[fr]=Évènement de mode @@ -110,6 +113,7 @@ Comment[cs]=Režim se změnil Comment[da]=Tilstand er ændret Comment[de]=Der Modus wurde geändert +Comment[el]=Η λειτουργία άλλαξε Comment[es]=El modo ha cambiado Comment[et]=Režiimi on muudetud Comment[fr]=Le mode à changé @@ -144,6 +148,7 @@ Name[cs]=Událost aplikace Name[da]=Programhændelse Name[de]=Programmereignis +Name[el]=Γεγονός εφαρμογής Name[es]=Evento de aplicación Name[et]=Rakenduse sündmus Name[fr]=Évènement d'application @@ -175,6 +180,7 @@ Comment[ca]=L'Irkick ha activat una aplicació Comment[da]=IRKick har startet et program Comment[de]=Irkick hat eine Anwendung ausgelöst +Comment[el]=Irkick ενεργοποίησε μία εφαρμογή Comment[es]=Irkick ha lanzado una aplicación Comment[et]=Irkick on käivitanud rakenduse Comment[fr]=Irkick a déclenché une application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/kdelirc/kcmlirc/kcm_lirc.desktop new/kdeutils-4.3.0/kdelirc/kcmlirc/kcm_lirc.desktop --- old/kdeutils-4.2.98/kdelirc/kcmlirc/kcm_lirc.desktop 2009-07-21 17:23:06.000000000 +0200 +++ new/kdeutils-4.3.0/kdelirc/kcmlirc/kcm_lirc.desktop 2009-07-29 13:12:56.000000000 +0200 @@ -26,6 +26,7 @@ Name[cy]=Rheolyddion Pell Name[da]=Fjernbetjeninger Name[de]=Fernsteuerungen +Name[el]=Τηλεχειριστήρια Name[eo]=Teleregiloj Name[es]=Mandos a distancia Name[et]=Kaugjuhtimine @@ -73,6 +74,7 @@ Comment[cy]=Ffurfweddu eich rheolyddion pell ar gyfer ddefnydd efo cymhwysiadau Comment[da]=Indstil dine fjernbetjeninger til brug i programmer Comment[de]=Einrichtung diverser Applikationen zur Bedienung mit einer Fernsteuerung +Comment[el]=Ρυθμίστε τα τηλεχειριστήρια για χρήση με εφαρμογές Comment[es]=Configurar sus mandos a distancia para usar con las aplicaciones Comment[et]=Kaugjuhtimise seadistamine rakenduste jaoks Comment[eu]=Konfiguratu zure urruneko kontrolak aplikazioekin erabiltzeko diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/kdf/kdfconfig.cpp new/kdeutils-4.3.0/kdf/kdfconfig.cpp --- old/kdeutils-4.2.98/kdf/kdfconfig.cpp 2009-02-12 11:22:55.000000000 +0100 +++ new/kdeutils-4.3.0/kdf/kdfconfig.cpp 2009-07-29 13:12:55.000000000 +0200 @@ -138,7 +138,7 @@ connect(mFileManagerEdit,SIGNAL(textChanged (const QString &)),this,SLOT(slotChanged())); layoutFileManager->addWidget( mFileManagerEdit ); - QHBoxLayout * layoutOptions = new QHBoxLayout(); + QVBoxLayout * layoutOptions = new QVBoxLayout(); Q_CHECK_PTR( layoutOptions ); topLayout->addLayout( layoutOptions ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/kgpg/model/kgpgitemmodel.cpp new/kdeutils-4.3.0/kgpg/model/kgpgitemmodel.cpp --- old/kdeutils-4.2.98/kgpg/model/kgpgitemmodel.cpp 2009-04-28 15:45:59.000000000 +0200 +++ new/kdeutils-4.3.0/kgpg/model/kgpgitemmodel.cpp 2009-07-29 13:12:55.000000000 +0200 @@ -21,6 +21,7 @@ #include "kgpginterface.h" #include "kgpgsettings.h" #include "convert.h" +#include <KGlobal> #include <KLocale> KGpgItemModel::KGpgItemModel(QObject *parent) @@ -131,7 +132,7 @@ } case KEYCOLUMN_EXPIR: if (role == Qt::DisplayRole) - return node->getExpiration(); + return KGlobal::locale()->formatDate(node->getExpiration(), KLocale::ShortDate); break; case KEYCOLUMN_SIZE: switch (role) { @@ -153,7 +154,7 @@ break; case KEYCOLUMN_CREAT: if (role == Qt::DisplayRole) - return node->getCreation(); + return KGlobal::locale()->formatDate(node->getCreation(), KLocale::ShortDate); break; case KEYCOLUMN_ID: if (role == Qt::DisplayRole) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeutils-4.2.98/printer-applet/printer-applet.py new/kdeutils-4.3.0/printer-applet/printer-applet.py --- old/kdeutils-4.2.98/printer-applet/printer-applet.py 2009-04-15 12:25:19.000000000 +0200 +++ new/kdeutils-4.3.0/printer-applet/printer-applet.py 2009-07-29 13:12:56.000000000 +0200 @@ -1138,10 +1138,9 @@ copyright = ki18n("2007-2008 Canonical Ltd") text = KLocalizedString() homePage = "http://utils.kde.org/projects/printer-applet" - bugEmail = "" aboutData = KAboutData (appName, catalogue, programName, version, description, - license, copyright, text, homePage, bugEmail) + license, copyright, text, homePage) aboutData.addAuthor(ki18n("Jonathan Riddell"), ki18n("Author")) aboutData.addAuthor(ki18n("Tim Waugh/Red Hat"), ki18n("System Config Printer Author")) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org