Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2014-06-19 13:15:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2014-05-22 06:49:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2014-06-19 13:15:17.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 8 18:28:45 UTC 2014 - [email protected] + +- Update to 4.13.2 + * KDE 4.13 release + * See http://www.kde.org/announcements/announce-4.13.2.php + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.13.1.tar.xz New: ---- kde-baseapps-4.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.MWE2U2/_old 2014-06-19 13:15:17.000000000 +0200 +++ /var/tmp/diff_new_pack.MWE2U2/_new 2014-06-19 13:15:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.13.1 +Version: 4.13.2 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ ++++++ kde-baseapps-4.13.1.tar.xz -> kde-baseapps-4.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kfileitemmodel.cpp new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kfileitemmodel.cpp --- old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kfileitemmodel.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kfileitemmodel.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -395,7 +395,41 @@ index = m_items.value(urlToFind, -1); } - Q_ASSERT(index >= 0 || m_items.count() == m_itemData.count()); + if (index < 0) { + // The item could not be found, even though all items from m_itemData + // should be in m_items now. We print some diagnostic information which + // might help to find the cause of the problem, but only once. This + // prevents that obtaining and printing the debugging information + // wastes CPU cycles and floods the shell or .xsession-errors. + static bool printDebugInfo = true; + + if (m_items.count() != m_itemData.count() && printDebugInfo) { + printDebugInfo = false; + + kWarning() << "The model is in an inconsistent state."; + kWarning() << "m_items.count() ==" << m_items.count(); + kWarning() << "m_itemData.count() ==" << m_itemData.count(); + + // Check if there are multiple items with the same URL. + QMultiHash<KUrl, int> indexesForUrl; + for (int i = 0; i < m_itemData.count(); ++i) { + indexesForUrl.insert(m_itemData.at(i)->item.url(), i); + } + + foreach (const KUrl& url, indexesForUrl.uniqueKeys()) { + if (indexesForUrl.count(url) > 1) { + kWarning() << "Multiple items found with the URL" << url; + foreach (int index, indexesForUrl.values(url)) { + const ItemData* data = m_itemData.at(index); + kWarning() << "index" << index << ":" << data->item; + if (data->parent) { + kWarning() << "parent" << data->parent->item; + } + } + } + } + } + } return index; } @@ -486,6 +520,18 @@ m_urlsToExpand.insert(url); } } else { + // Note that there might be (indirect) children of the folder which is to be collapsed in + // m_pendingItemsToInsert. To prevent that they will be inserted into the model later, + // possibly without a parent, which might result in a crash, we insert all pending items + // right now. All new items which would be without a parent will then be removed. + dispatchPendingItemsToInsert(); + + // Check if the index of the collapsed folder has changed. If that is the case, then items + // were inserted before the collapsed folder, and its index needs to be updated. + if (m_itemData.at(index)->item != item) { + index = this->index(item); + } + m_expandedDirs.remove(targetUrl); m_dirLister->stop(url); @@ -500,7 +546,9 @@ ItemData* itemData = m_itemData.at(childIndex); if (itemData->values.value("isExpanded").toBool()) { const KUrl targetUrl = itemData->item.targetUrl(); + const KUrl url = itemData->item.url(); m_expandedDirs.remove(targetUrl); + m_dirLister->stop(url); // TODO: try to unit-test this, see https://bugs.kde.org/show_bug.cgi?id=332102#c11 expandedChildren.append(targetUrl); } ++childIndex; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemlistview.cpp new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kitemlistview.cpp --- old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemlistview.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kitemlistview.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -1048,11 +1048,17 @@ (!verticalScrollOrientation && maximumScrollOffset() > size().width()); if (decreaseLayouterSize) { const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent); + + int scrollbarSpacing = 0; + if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) { + scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing); + } + QSizeF layouterSize = m_layouter->size(); if (verticalScrollOrientation) { - layouterSize.rwidth() -= scrollBarExtent; + layouterSize.rwidth() -= scrollBarExtent + scrollbarSpacing; } else { - layouterSize.rheight() -= scrollBarExtent; + layouterSize.rheight() -= scrollBarExtent + scrollbarSpacing; } m_layouter->setSize(layouterSize); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemlistwidget.cpp new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kitemlistwidget.cpp --- old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemlistwidget.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kitemlistwidget.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -282,7 +282,7 @@ void KItemListWidget::setHoverPosition(const QPointF& pos) { if (m_selectionToggle) { - m_selectionToggle->setHovered(m_selectionToggle->contains(pos)); + m_selectionToggle->setHovered(selectionToggleRect().contains(pos)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemrange.h new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kitemrange.h --- old/kde-baseapps-4.13.1/dolphin/src/kitemviews/kitemrange.h 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/kitemviews/kitemrange.h 2014-06-04 21:49:02.000000000 +0200 @@ -78,7 +78,10 @@ int index = *it; int count = 1; - ++it; + // Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672 + while (it != end && *it == index) { + ++it; + } while (it != end) { if (*it == index + count) { @@ -89,6 +92,11 @@ count = 1; } ++it; + + // Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672 + while (it != end && *it == *(it - 1)) { + ++it; + } } result << KItemRange(index, count); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/panels/places/placesitem.cpp new/kde-baseapps-4.13.2/dolphin/src/panels/places/placesitem.cpp --- old/kde-baseapps-4.13.1/dolphin/src/panels/places/placesitem.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/panels/places/placesitem.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -135,7 +135,7 @@ const QString udi = bookmark.metaDataItem("UDI"); if (udi.isEmpty()) { setIcon(bookmark.icon()); - setText(bookmark.text()); + setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data())); setUrl(bookmark.url()); } else { initializeDevice(udi); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/search/filenamesearchprotocol.cpp new/kde-baseapps-4.13.2/dolphin/src/search/filenamesearchprotocol.cpp --- old/kde-baseapps-4.13.1/dolphin/src/search/filenamesearchprotocol.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/search/filenamesearchprotocol.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -92,10 +92,7 @@ if (!m_regExp || item.name().contains(*m_regExp)) { addItem = true; } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) { - qDebug() << "### Checking" << item; addItem = contentContainsPattern(item.url()); - } else { - qDebug() << "### NOT Checking" << item; } if (addItem) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/settings/additionalinfodialog.cpp new/kde-baseapps-4.13.2/dolphin/src/settings/additionalinfodialog.cpp --- old/kde-baseapps-4.13.1/dolphin/src/settings/additionalinfodialog.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/settings/additionalinfodialog.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -75,7 +75,6 @@ QVBoxLayout* layout = new QVBoxLayout(mainWidget); layout->addWidget(header); layout->addWidget(m_listWidget); - layout->addStretch(1); setMainWidget(mainWidget); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/tests/CMakeLists.txt new/kde-baseapps-4.13.2/dolphin/src/tests/CMakeLists.txt --- old/kde-baseapps-4.13.1/dolphin/src/tests/CMakeLists.txt 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/tests/CMakeLists.txt 2014-06-04 21:49:02.000000000 +0200 @@ -12,6 +12,13 @@ kde4_add_unit_test(kitemsettest TEST ${kitemsettest_SRCS}) target_link_libraries(kitemsettest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) +# KItemRangeTest +set(kitemrangetest_SRCS + kitemrangetest.cpp +) +kde4_add_unit_test(kitemrangetest TEST ${kitemrangetest_SRCS}) +target_link_libraries(kitemrangetest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) + # KItemListSelectionManagerTest set(kitemlistselectionmanagertest_SRCS kitemlistselectionmanagertest.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/tests/kfileitemmodeltest.cpp new/kde-baseapps-4.13.2/dolphin/src/tests/kfileitemmodeltest.cpp --- old/kde-baseapps-4.13.1/dolphin/src/tests/kfileitemmodeltest.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/dolphin/src/tests/kfileitemmodeltest.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -93,7 +93,9 @@ void testChangeRolesForFilteredItems(); void testChangeSortRoleWhileFiltering(); void testRefreshFilteredItems(); + void testCollapseFolderWhileLoading(); void testCreateMimeData(); + void testDeleteFileMoreThanOnce(); private: QStringList itemsInModel() const; @@ -1619,6 +1621,104 @@ delete mimeData; } +void KFileItemModelTest::testCollapseFolderWhileLoading() +{ + QSet<QByteArray> modelRoles = m_model->roles(); + modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; + m_model->setRoles(modelRoles); + + QStringList files; + files << "a2/b/c1.txt"; + m_testDir->createFiles(files); + + m_model->loadDirectory(m_testDir->url()); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a2"); + + // Expand "a2/". + m_model->setExpanded(0, true); + QVERIFY(m_model->isExpanded(0)); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a2" << "b"); + + // Expand "a2/b/". + m_model->setExpanded(1, true); + QVERIFY(m_model->isExpanded(1)); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a2" << "b" << "c1.txt"); + + // Simulate that a new item "c2.txt" appears, but that the dir lister's completed() + // signal is not emitted yet. + const KFileItem fileItemC1 = m_model->fileItem(2); + KFileItem fileItemC2 = fileItemC1; + KUrl urlC2 = fileItemC2.url(); + urlC2.setFileName("c2.txt"); + fileItemC2.setUrl(urlC2); + + const KUrl urlB = m_model->fileItem(1).url(); + m_model->slotItemsAdded(urlB, KFileItemList() << fileItemC2); + QCOMPARE(itemsInModel(), QStringList() << "a2" << "b" << "c1.txt"); + + // Collapse "a2/". This should also remove all its (indirect) children from + // the model and from the model's m_pendingItemsToInsert member. + m_model->setExpanded(0, false); + QCOMPARE(itemsInModel(), QStringList() << "a2"); + + // Simulate that the dir lister's completed() signal is emitted. If "c2.txt" + // is still in m_pendingItemsToInsert, then we might get a crash, see + // https://bugs.kde.org/show_bug.cgi?id=332102. Even if the crash is not + // reproducible here, Valgrind will complain, and the item "c2.txt" will appear + // without parent in the model. + m_model->slotCompleted(); + QCOMPARE(itemsInModel(), QStringList() << "a2"); + + // Expand "a2/" again. + m_model->setExpanded(0, true); + QVERIFY(m_model->isExpanded(0)); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a2" << "b"); + + // Now simulate that a new folder "a1/" is appears, but that the dir lister's + // completed() signal is not emitted yet. + const KFileItem fileItemA2 = m_model->fileItem(0); + KFileItem fileItemA1 = fileItemA2; + KUrl urlA1 = fileItemA1.url(); + urlA1.setFileName("a1"); + fileItemA1.setUrl(urlA1); + + m_model->slotItemsAdded(m_model->directory(), KFileItemList() << fileItemA1); + QCOMPARE(itemsInModel(), QStringList() << "a2" << "b"); + + // Collapse "a2/". Note that this will cause "a1/" to be added to the model, + // i.e., the index of "a2/" will change from 0 to 1. Check that this does not + // confuse the code which collapses the folder. + m_model->setExpanded(0, false); + QCOMPARE(itemsInModel(), QStringList() << "a1" << "a2"); + QVERIFY(!m_model->isExpanded(0)); + QVERIFY(!m_model->isExpanded(1)); +} + +void KFileItemModelTest::testDeleteFileMoreThanOnce() +{ + QStringList files; + files << "a.txt" << "b.txt" << "c.txt" << "d.txt"; + m_testDir->createFiles(files); + + m_model->loadDirectory(m_testDir->url()); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt" << "d.txt"); + + const KFileItem fileItemB = m_model->fileItem(1); + + // Tell the model that a list of items has been deleted, where "b.txt" appears twice in the list. + KFileItemList list; + list << fileItemB << fileItemB; + m_model->slotItemsDeleted(list); + + QVERIFY(m_model->isConsistent()); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "c.txt" << "d.txt"); +} + QStringList KFileItemModelTest::itemsInModel() const { QStringList items; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/dolphin/src/tests/kitemrangetest.cpp new/kde-baseapps-4.13.2/dolphin/src/tests/kitemrangetest.cpp --- old/kde-baseapps-4.13.1/dolphin/src/tests/kitemrangetest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-baseapps-4.13.2/dolphin/src/tests/kitemrangetest.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -0,0 +1,75 @@ +/*************************************************************************** + * Copyright (C) 2014 by Frank Reininghaus <[email protected]> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#include <qtest_kde.h> + +#include "kitemviews/kitemrange.h" + +#include <QVector> + +Q_DECLARE_METATYPE(QVector<int>); +Q_DECLARE_METATYPE(KItemRangeList); + +class KItemRangeTest : public QObject +{ + Q_OBJECT + +private slots: + void testFromSortedContainer_data(); + void testFromSortedContainer(); +}; + +void KItemRangeTest::testFromSortedContainer_data() +{ + QTest::addColumn<QVector<int> >("sortedNumbers"); + QTest::addColumn<KItemRangeList>("expected"); + + QTest::newRow("empty") << QVector<int>() << KItemRangeList(); + QTest::newRow("[1]") << (QVector<int>() << 1) << (KItemRangeList() << KItemRange(1, 1)); + QTest::newRow("[9]") << (QVector<int>() << 9) << (KItemRangeList() << KItemRange(9, 1)); + QTest::newRow("[1-2]") << (QVector<int>() << 1 << 2) << (KItemRangeList() << KItemRange(1, 2)); + QTest::newRow("[1-3]") << (QVector<int>() << 1 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3)); + QTest::newRow("[1] [4]") << (QVector<int>() << 1 << 4) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(4, 1)); + QTest::newRow("[1-3] [5]") << (QVector<int>() << 1 << 2 << 3 << 5) << (KItemRangeList() << KItemRange(1, 3) << KItemRange(5, 1)); + QTest::newRow("[1] [5-6]") << (QVector<int>() << 1 << 5 << 6) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2)); + QTest::newRow("duplicates: 1 1") << (QVector<int>() << 1 << 1) << (KItemRangeList() << KItemRange(1, 1)); + QTest::newRow("duplicates: 1 1 1") << (QVector<int>() << 1 << 1 << 1) << (KItemRangeList() << KItemRange(1, 1)); + QTest::newRow("duplicates: 1 1 5") << (QVector<int>() << 1 << 1 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1)); + QTest::newRow("duplicates: 1 5 5") << (QVector<int>() << 1 << 5 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1)); + QTest::newRow("duplicates: 1 1 1 5") << (QVector<int>() << 1 << 1 << 1 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1)); + QTest::newRow("duplicates: 1 5 5 5") << (QVector<int>() << 1 << 5 << 5 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1)); + QTest::newRow("duplicates: 1 1 2") << (QVector<int>() << 1 << 1 << 2) << (KItemRangeList() << KItemRange(1, 2)); + QTest::newRow("duplicates: 1 2 2") << (QVector<int>() << 1 << 2 << 2) << (KItemRangeList() << KItemRange(1, 2)); + QTest::newRow("duplicates: 1 1 2 3") << (QVector<int>() << 1 << 1 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3)); + QTest::newRow("duplicates: 1 2 2 3") << (QVector<int>() << 1 << 2 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3)); + QTest::newRow("duplicates: 1 2 3 3") << (QVector<int>() << 1 << 2 << 3 << 3) << (KItemRangeList() << KItemRange(1, 3)); +} + +void KItemRangeTest::testFromSortedContainer() +{ + QFETCH(QVector<int>, sortedNumbers); + QFETCH(KItemRangeList, expected); + + const KItemRangeList result = KItemRangeList::fromSortedContainer(sortedNumbers); + QCOMPARE(expected, result); +} + +QTEST_KDEMAIN(KItemRangeTest, NoGUI) + +#include "kitemrangetest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/konqueror/settings/kio/uasproviders/safari40.desktop new/kde-baseapps-4.13.2/konqueror/settings/kio/uasproviders/safari40.desktop --- old/kde-baseapps-4.13.1/konqueror/settings/kio/uasproviders/safari40.desktop 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/konqueror/settings/kio/uasproviders/safari40.desktop 2014-06-04 21:49:02.000000000 +0200 @@ -68,7 +68,7 @@ Type=Service X-KDE-ServiceTypes=UserAgentStrings X-KDE-UA-TAG=SAF -X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_6_1; appLanguage) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10 +X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_1; appLanguage) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10 X-KDE-UA-NAME=Safari X-KDE-UA-VERSION=4.0 X-KDE-UA-SYSNAME=Mac OS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/konqueror/settings/kio/uasproviders/safari517.desktop new/kde-baseapps-4.13.2/konqueror/settings/kio/uasproviders/safari517.desktop --- old/kde-baseapps-4.13.1/konqueror/settings/kio/uasproviders/safari517.desktop 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/konqueror/settings/kio/uasproviders/safari517.desktop 2014-06-04 21:49:02.000000000 +0200 @@ -47,7 +47,7 @@ Type=Service X-KDE-ServiceTypes=UserAgentStrings X-KDE-UA-TAG=SAF -X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_7_3; appLanguage) AppleWebKit/537.13+ (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2 +X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_7_3; appLanguage) AppleWebKit/537.13+ (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2 X-KDE-UA-NAME=Safari X-KDE-UA-VERSION=5.1.7 X-KDE-UA-SYSNAME=Mac OS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/konqueror/settings/kio/uasproviders/safari60.desktop new/kde-baseapps-4.13.2/konqueror/settings/kio/uasproviders/safari60.desktop --- old/kde-baseapps-4.13.1/konqueror/settings/kio/uasproviders/safari60.desktop 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/konqueror/settings/kio/uasproviders/safari60.desktop 2014-06-04 21:49:02.000000000 +0200 @@ -47,7 +47,7 @@ Type=Service X-KDE-ServiceTypes=UserAgentStrings X-KDE-UA-TAG=SAF -X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_7_3; appLanguage) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Safari/8536.25 +X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_7_3; appLanguage) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Safari/8536.25 X-KDE-UA-NAME=Safari X-KDE-UA-VERSION=6.0 X-KDE-UA-SYSNAME=Mac OS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/plasma/applets/folderview/folderview.cpp new/kde-baseapps-4.13.2/plasma/applets/folderview/folderview.cpp --- old/kde-baseapps-4.13.1/plasma/applets/folderview/folderview.cpp 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/plasma/applets/folderview/folderview.cpp 2014-06-04 21:49:02.000000000 +0200 @@ -675,10 +675,6 @@ uiLocation.showDesktopFolder->setChecked(true); uiLocation.placesCombo->setEnabled(false); uiLocation.lineEdit->setEnabled(false); - } else if (m_url == KUrl("activities:/current/")) { - uiLocation.showActivity->setChecked(true); - uiLocation.placesCombo->setEnabled(false); - uiLocation.lineEdit->setEnabled(false); } else { QModelIndex index; for (int i = 0; i < placesFilter->rowCount(); i++) { @@ -823,7 +819,6 @@ connect(uiFilter.filterFilesList->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), parent, SLOT(settingsModified())); connect(uiLocation.showDesktopFolder, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); - connect(uiLocation.showActivity, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); connect(uiLocation.showPlace, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); connect(uiLocation.titleCombo, SIGNAL(currentIndexChanged(int)), parent, SLOT(settingsModified())); connect(uiLocation.titleEdit, SIGNAL(textChanged(QString)), parent, SLOT(settingsModified())); @@ -838,8 +833,6 @@ if (uiLocation.showDesktopFolder->isChecked()) { url = KUrl("desktop:/"); - } else if (uiLocation.showActivity->isChecked()) { - url = KUrl("activities:/current/"); } else if (uiLocation.showPlace->isChecked()) { PlacesFilterModel *filter = static_cast<PlacesFilterModel*>(uiLocation.placesCombo->model()); KFilePlacesModel *model = static_cast<KFilePlacesModel*>(filter->sourceModel()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.13.1/plasma/applets/folderview/folderviewLocationConfig.ui new/kde-baseapps-4.13.2/plasma/applets/folderview/folderviewLocationConfig.ui --- old/kde-baseapps-4.13.1/plasma/applets/folderview/folderviewLocationConfig.ui 2014-04-30 09:34:32.000000000 +0200 +++ new/kde-baseapps-4.13.2/plasma/applets/folderview/folderviewLocationConfig.ui 2014-06-04 21:49:02.000000000 +0200 @@ -42,16 +42,6 @@ </widget> </item> <item> - <widget class="QRadioButton" name="showActivity"> - <property name="text"> - <string>Show the files related to the current activity</string> - </property> - <attribute name="buttonGroup"> - <string notr="true">locatgionButtonGroup</string> - </attribute> - </widget> - </item> - <item> <widget class="QRadioButton" name="showPlace"> <property name="text"> <string>Show a place:</string> @@ -221,7 +211,6 @@ </customwidgets> <tabstops> <tabstop>showDesktopFolder</tabstop> - <tabstop>showActivity</tabstop> <tabstop>showPlace</tabstop> <tabstop>placesCombo</tabstop> <tabstop>showCustomFolder</tabstop> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
