[kdebase] - FolderView keeps sorting icons (kde#227157)

[Rex Dieter]

commit efb02ca28ffff1368363a22e08f3ae8d80d58542
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 13 07:51:41 2010 -0500

    - FolderView keeps sorting icons (kde#227157)

 kdebase-4.5.2-folderview_sorting_kde227157.patch |   38 ++++++++++++++++++++++
 kdebase.spec                                     |    8 ++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-4.5.2-folderview_sorting_kde227157.patch b/kdebase-4.5.2-folderview_sorting_kde227157.patch
new file mode 100644
index 0000000..632b053
--- /dev/null
+++ b/kdebase-4.5.2-folderview_sorting_kde227157.patch
@@ -0,0 +1,38 @@
+--- branches/KDE/4.5/kdebase/apps/plasma/applets/folderview/folderview.cpp	2010/10/12 20:59:24	1185295
++++ branches/KDE/4.5/kdebase/apps/plasma/applets/folderview/folderview.cpp	2010/10/12 21:01:29	1185296
+@@ -360,7 +360,7 @@
+     m_model->setMimeTypeFilterList(m_filterFilesMimeList);
+     m_model->setFileNameFilter(m_filterFiles);
+     m_model->setSortDirectoriesFirst(m_sortDirsFirst);
+-    m_model->setDynamicSortFilter(true);
++    m_model->setDynamicSortFilter(m_sortColumn != -1);
+     m_model->sort(m_sortColumn != -1 ? m_sortColumn : KDirModel::Name, Qt::AscendingOrder);
+ 
+     DirLister *lister = new DirLister(this);
+@@ -712,8 +712,10 @@
+         if (m_sortColumn != -1) {
+             m_model->invalidate();
+             m_model->sort(m_sortColumn, Qt::AscendingOrder);
++            m_model->setDynamicSortFilter(true);
+         } else if (m_iconView) {
+             m_iconView->setCustomLayout(true);
++            m_model->setDynamicSortFilter(false);
+         }
+         updateSortActionsState();
+         cg.writeEntry("sortColumn", m_sortColumn);
+@@ -1583,6 +1585,7 @@
+     if (column != m_sortColumn) {
+         m_model->invalidate();
+         m_model->sort(column, Qt::AscendingOrder);
++        m_model->setDynamicSortFilter(true);
+         m_sortColumn = column;
+         config().writeEntry("sortColumn", m_sortColumn);
+         emit configNeedsSaving();
+@@ -1683,6 +1686,7 @@
+     // If the user has rearranged the icons, the view is no longer sorted
+     if (m_sortColumn != -1) {
+         m_sortColumn = -1;
++        m_model->setDynamicSortFilter(false);
+         updateSortActionsState();
+         config().writeEntry("sortColumn", m_sortColumn);
+         emit configNeedsSaving();
diff --git a/kdebase.spec b/kdebase.spec
index 3965bf0..9367ffa 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -2,7 +2,7 @@ Name:    kdebase
 Summary: KDE Core Applications 
 Epoch:   6
 Version: 4.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -26,6 +26,8 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
 ## upstream patches
+# http://bugs..kde.org/227157
+Patch100: kdebase-4.5.2-folderview_sorting_kde227157.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -121,6 +123,7 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 %patch2 -p1 -b .home-icon
 %patch3 -p1 -b .kde#228593
 %patch4 -p1 -b .bz#631481
+%patch100 -p4 -b .folderview_sorting_kde227157
 
 
 %build
@@ -276,6 +279,9 @@ fi
 
 
 %changelog
+* Wed Oct 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.5.2-2
+- FolderView keeps sorting icons (kde#227157)
+
 * Fri Oct 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.5.2-1
 - 4.5.2