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

[Shane Bryan]

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

Thank You,
Shane Bryan

[This message was auto-generated]

---

Request #8463:

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


Message:
    Fix 1.1. Blocker BMC# 8426 - qtcontacts-tracker needs to be updated to real QtContacts 1.1

State:   new          2010-10-14T10:21:37 sbryan
Comment: None



changes files:
--------------
--- libseaside.changes
+++ libseaside.changes
@@ -0,0 +1,3 @@
+* Thu Oct 14 2010 Shane Bryan <shane.bryan at linux.intel.com> - 0.0.37
+- Fix 1.1. Blocker BMC# 8426
+  - BMC#8426 - qtcontacts-tracker needs to be updated to real QtContacts 1.1

new:
----
  build_against_new-qt-mobility.patch

spec files:
-----------
--- libseaside.spec
+++ libseaside.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
@@ -14,6 +14,7 @@
 URL:        http://meego.com
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  libseaside.yaml
+Patch0:     build_against_new-qt-mobility.patch
 Requires:   %{name} >= %{version}
 Requires:   qtcontacts-tracker
 Requires(post): /sbin/ldconfig
@@ -50,6 +51,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+# build_against_new-qt-mobility.patch
+%patch0 -p1
 # >> setup
 # << setup
 

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

++++++ build_against_new-qt-mobility.patch (new)
--- build_against_new-qt-mobility.patch
+++ build_against_new-qt-mobility.patch
+diff -Naur libseaside-0.0.37/src/seasidesyncmodel.cpp libseaside-0.0.37-new/src/seasidesyncmodel.cpp
+--- libseaside-0.0.37/src/seasidesyncmodel.cpp	2010-09-30 12:14:46.000000000 -0700
++++ libseaside-0.0.37-new/src/seasidesyncmodel.cpp	2010-10-01 12:36:06.570525343 -0700
+@@ -172,7 +172,10 @@
+       if((error == QContactManager::NoError) && (meCardId != 0)){
+ 	qDebug() << "[SeasideSyncModel] valid selfId, error" << error << "id " << meCardId;
+         //check if contact with selfId exists
+-        meContact = priv->manager->contact(meCardId, QStringList() << QContactName::DefinitionName);
++        //meContact = priv->manager->contact(meCardId, QStringList() << QContactName::DefinitionName);
++        QContactFetchHint hint;
++        hint.setDetailDefinitionsHint(QStringList() << QContactName::DefinitionName);
++        meContact = priv->manager->contact(meCardId, hint);
+ 
+         //if contact doesn't exist, create it
+         if(meContact.localId() != meCardId){
+@@ -185,7 +188,8 @@
+         }else{
+ 	  qDebug() << "SeasideSyncModel::SeasideSyncModel() id is valid and MeCard exists" << meCardId;
+ 	  //If it does exist, check that contact has valid firstname
+-          meContact = priv->manager->contact(meCardId, QStringList() << QContactName::DefinitionName);
++          //meContact = priv->manager->contact(meCardId, QStringList() << QContactName::DefinitionName);
++          meContact = priv->manager->contact(meCardId, hint);
+           QString firstname = meContact.detail(QContactName::DefinitionName).value(QContactName::FieldFirstName);
+ 	  qDebug() << "[SeasideSyncModel] meCard has firstname" << firstname;
+ 	  //if no firstname, then update meCard

++++++ libseaside.yaml
--- libseaside.yaml
+++ libseaside.yaml
@@ -7,6 +7,8 @@
 URL: http://meego.com
 Sources:
     - "%{name}-%{version}.tar.bz2"
+Patches:
+    - "build_against_new-qt-mobility.patch"
 Requires: 
     - "%{name} >= %{version}"
     - qtcontacts-tracker