[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1-1-10-g64bc5e2

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 478336f2322abed320134d517a33a64246b7b99e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu May 26 22:39:00 2011 +0200

    Add displaying_only_unread_issue.diff.
---
 debian/changelog                                 |    1 +
 debian/patches/displaying_only_unread_issue.diff |   39 ++++++++++++++++++++++
 debian/patches/series                            |    1 +
 3 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49b0323..8321d46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdepim (4:4.4.11.1+l10n-0r2) UNRELEASED; urgency=low
 
   * Provide translations in orig-l10n tarball. Also add kdepim_l10n.diff to
     install that translations.
+  * Add displaying_only_unread_issue.diff. (Closes: #625646)
   * Bump Standards-Version to 3.9.2; no changes needed.
   * Bump kde-sc-dev-latest build dependency to 4:4.6.3.
 
diff --git a/debian/patches/displaying_only_unread_issue.diff b/debian/patches/displaying_only_unread_issue.diff
new file mode 100644
index 0000000..dbb6939
--- /dev/null
+++ b/debian/patches/displaying_only_unread_issue.diff
@@ -0,0 +1,39 @@
+commit 1380ce172e4f98ab433085721f0e8fddef4ba621
+Author: Christophe Giboudeaux <cgiboudeaux at gmx.com>
+Date:   Thu Apr 28 11:34:39 2011 +0200
+
+    Revert "Maintain sort order when new articles are added"
+    
+    While fixing the new article sorting issue, this introduced regressions
+    when displaying only unread articles.
+    
+    Alex, please fix and resubmit to kdepim/4.6.
+    BUG: 271794
+    BUG: 271149
+    CCBUG: 271640
+    FIXED-IN: kdepim 4.6
+    
+    This reverts commit e95e0f8e3687137f02e19d3ecf5ea0a9463f5962.
+
+--- a/akregator/src/articlelistview.cpp
++++ b/akregator/src/articlelistview.cpp
+@@ -156,11 +156,9 @@
+     m_proxy->setSourceModel( model );
+     m_proxy->setSortRole( ArticleModel::SortRole );
+     m_proxy->setFilters( m_matchers );
+-    m_proxy->setDynamicSortFilter( true );
+     FilterDeletedProxyModel* const proxy2 = new FilterDeletedProxyModel( model );
+     proxy2->setSortRole( ArticleModel::SortRole );
+     proxy2->setSourceModel( m_proxy );
+-    proxy2->setDynamicSortFilter( true );
+ 
+     FilterColumnsProxyModel* const columnsProxy = new FilterColumnsProxyModel( model );
+     columnsProxy->setSortRole( ArticleModel::SortRole );
+@@ -169,7 +167,6 @@
+     columnsProxy->setColumnEnabled( ArticleModel::FeedTitleColumn );
+     columnsProxy->setColumnEnabled( ArticleModel::DateColumn );
+     columnsProxy->setColumnEnabled( ArticleModel::AuthorColumn );
+-    columnsProxy->setDynamicSortFilter( true );
+ 
+     setModel( columnsProxy );
+     header()->setContextMenuPolicy( Qt::CustomContextMenu );
diff --git a/debian/patches/series b/debian/patches/series
index 21774a1..1d7a426 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debianize_akregator_default.diff
 kdepim_l10n.diff
+displaying_only_unread_issue.diff

-- 
KDE PIM module packaging