rev 15722 - in trunk/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2009-08-21 20:54:27 +0000 (Fri, 21 Aug 2009)
New Revision: 15722

Added:
   trunk/packages/kdelibs/debian/patches/01_r1012564.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/series
Log:
r1012564 patch pushed by dfaure


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-08-21 19:22:16 UTC (rev 15721)
+++ trunk/packages/kdelibs/debian/changelog	2009-08-21 20:54:27 UTC (rev 15722)
@@ -1,3 +1,9 @@
+kde4libs (4:4.3.0-2) UNRELEASED; urgency=low
+
+  * Add patch: 01_r1012564.diff: Fixes a data loss with KIO.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 21 Aug 2009 22:51:23 +0200
+
 kde4libs (4:4.3.0-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdelibs/debian/patches/01_r1012564.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/01_r1012564.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/01_r1012564.diff	2009-08-21 20:54:27 UTC (rev 15722)
@@ -0,0 +1,69 @@
+Index: kio/kio/kfileitem.cpp
+===================================================================
+--- kio/kio/kfileitem.cpp	(revision 1012563)
++++ kio/kio/kfileitem.cpp	(revision 1012564)
+@@ -532,6 +532,9 @@
+ {
+     d->m_strName = name;
+     d->m_strText = KIO::decodeFileName( d->m_strName );
++    if (d->m_entry.contains(KIO::UDSEntry::UDS_NAME))
++        d->m_entry.insert(KIO::UDSEntry::UDS_NAME, d->m_strName); // #195385
++
+ }
+ 
+ QString KFileItem::linkDest() const
+Index: kio/tests/kfileitemtest.cpp
+===================================================================
+--- kio/tests/kfileitemtest.cpp	(revision 1012563)
++++ kio/tests/kfileitemtest.cpp	(revision 1012564)
+@@ -241,6 +241,21 @@
+     QVERIFY(fileItem.cmp(fileItem2));
+ }
+ 
++void KFileItemTest::testRename()
++{
++    KIO::UDSEntry entry;
++    const QString origName = QString::fromLatin1("foo");
++    entry.insert(KIO::UDSEntry::UDS_NAME, origName);
++    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
++    KFileItem fileItem(entry, KUrl("/dir/foo"));
++    QCOMPARE(fileItem.name(), origName);
++    QCOMPARE(fileItem.text(), origName);
++    const QString newName = QString::fromLatin1("FiNeX_rocks");
++    fileItem.setName(newName);
++    QCOMPARE(fileItem.name(), newName);
++    QCOMPARE(fileItem.text(), newName);
++    QCOMPARE(fileItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), newName); // #195385
++}
+ 
+ void KFileItemTest::testDecodeFileName_data()
+ {
+Index: kio/tests/kdirmodeltest.cpp
+===================================================================
+--- kio/tests/kdirmodeltest.cpp	(revision 1012563)
++++ kio/tests/kdirmodeltest.cpp	(revision 1012564)
+@@ -418,6 +418,12 @@
+     // check renaming happened
+     QCOMPARE( m_dirModel->itemForIndex( m_secondFileIndex ).url().url(), newUrl.url() );
+ 
++    // check that KDirLister::cachedItemForUrl won't give a bad name if copying that item (#195385)
++    KFileItem cachedItem = KDirLister::cachedItemForUrl(newUrl);
++    Q_ASSERT(!cachedItem.isNull());
++    QCOMPARE(cachedItem.name(), QString("toplevelfile_2_renamed"));
++    QCOMPARE(cachedItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), QString("toplevelfile_2_renamed"));
++
+     // Put things back to normal
+     job = KIO::rename(newUrl, url, KIO::HideProgressInfo);
+     ok = job->exec();
+Index: kio/tests/kfileitemtest.h
+===================================================================
+--- kio/tests/kfileitemtest.h	(revision 1012563)
++++ kio/tests/kfileitemtest.h	(revision 1012564)
+@@ -35,6 +35,7 @@
+     void testHiddenFile();
+     void testMimeTypeOnDemand();
+     void testCmp();
++    void testRename();
+ 
+     void testDecodeFileName_data();
+     void testDecodeFileName();

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2009-08-21 19:22:16 UTC (rev 15721)
+++ trunk/packages/kdelibs/debian/patches/series	2009-08-21 20:54:27 UTC (rev 15722)
@@ -1,3 +1,4 @@
+01_r1012564.diff
 08_add_debian_build_type.diff
 11_default_kde4_xdg_menu_prefix.diff
 13_qt4_designer_plugins_path.diff