[meego-commits] 8768: Changes to MeeGo:1.1:Handset/libseaside

[Connie Berardi]

Hi,
I have made the following changes to libseaside in project MeeGo:1.1:Handset. Please review and accept ASAP.

Thank You,
Connie Berardi

[This message was auto-generated]

---

Request #8768:

  submit:   devel:ux:handset:MeeGo:1.1/libseaside(r9) -> MeeGo:1.1:Handset/libseaside


Message:
    Cherry picked patch 0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch for BMC#6007 from Trunk

State:   new          2010-10-22T10:16:42 mcberadi
Comment: None



changes files:
--------------
--- libseaside.changes
+++ libseaside.changes
@@ -0,0 +1,2 @@
+* Fri Oct 22 2010  Connie Berardi <connie.berardi at intel.com> - 0.0.37
+- Fix Blocker BMC# 6007 0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch already sr'd in Trunk

new:
----
  0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch

spec files:
-----------
--- libseaside.spec
+++ libseaside.spec
@@ -1,6 +1,6 @@
 # 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.20
+# Do not Edit! Generated by:
+# spectacle version 0.18
 # 
 # >> macros
 # << macros
@@ -15,6 +15,7 @@
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  libseaside.yaml
 Patch0:     build_against_new-qt-mobility.patch
+Patch1:     0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch
 Requires:   %{name} >= %{version}
 Requires:   qtcontacts-tracker
 Requires(post): /sbin/ldconfig
@@ -53,6 +54,8 @@
 
 # build_against_new-qt-mobility.patch
 %patch0 -p1
+# 0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch
+%patch1 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ 0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch (new)
--- 0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch
+++ 0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch
+From c36f634685e7b9cfb9256df9d2a261b76ebbcde9 Mon Sep 17 00:00:00 2001
+From: Connie Berardi <connie.berardi at intel.com>
+Date: Mon, 11 Oct 2010 14:47:45 -0700
+Subject: [PATCH] Ensuring that a MeCard is always evaluated to be less than any other Contact in proxy model. Fix for BMC#6007 Contacts crashes when saving a contact with high possibility. Ensure proxy model and list are aligned in sort order.
+ Signed-off-by: Connie Berardi <connie.berardi at intel.com>
+
+---
+ src/seasideproxymodel.cpp |   26 +++++++++++++++++++++++---
+ 1 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/src/seasideproxymodel.cpp b/src/seasideproxymodel.cpp
+index 57fc607..04785d5 100644
+--- a/src/seasideproxymodel.cpp
++++ b/src/seasideproxymodel.cpp
+@@ -89,10 +89,30 @@ bool SeasideProxyModel::filterAcceptsRow(int source_row,
+ bool SeasideProxyModel::lessThan(const QModelIndex& left,
+                                  const QModelIndex& right) const
+ {
++
++    SeasideSyncModel *model = dynamic_cast<SeasideSyncModel *>(sourceModel());
++    if (!model)
++        return true;
++
++    SEASIDE_SHORTCUTS;
++    SEASIDE_SET_MODEL_AND_ROW(model, left.row());
++    const QString& lStr = SEASIDE_FIELD(FirstName, String);
++    const bool isleftSelf = SEASIDE_FIELD(isSelf, Bool);
++
++    SEASIDE_SET_MODEL_AND_ROW(model, right.row());
++    const QString& rStr = SEASIDE_FIELD(FirstName, String);
++    const bool isrightSelf = SEASIDE_FIELD(isSelf, Bool);
++
++    //qWarning() << "[ProxyModel] lessThan isSelf left" << isleftSelf << " right" << isrightSelf;
++
++    //MeCard should always be top of the list
++    if(isleftSelf)
++        return true;
++    if(isrightSelf)
++        return false;
++
+     if (priv->sortType == SortName) {
+-        const QString& lStr = left.data(Seaside::DataRole).toString();
+-        const QString& rStr = right.data(Seaside::DataRole).toString();
+-        //qWarning() << "[ProxyModel] lessThan " << lStr << "VS" << rStr;
++      //qWarning() << "[ProxyModel] lessThan " << lStr << "VS" << rStr;
+         return QString::localeAwareCompare(lStr, rStr) < 0;
+     }
+     else if (priv->sortType == SortRecent) {
+-- 
+1.7.2.2
+

++++++ libseaside.yaml
--- libseaside.yaml
+++ libseaside.yaml
@@ -9,6 +9,7 @@
     - "%{name}-%{version}.tar.bz2"
 Patches:
     - "build_against_new-qt-mobility.patch"
+    - "0001-Ensuring-that-a-MeCard-is-always-evaluated-to-be-les.patch"
 Requires: 
     - "%{name} >= %{version}"
     - qtcontacts-tracker