[meego-commits] 9275: Changes to Trunk:Handset/meegotouchcp-sync

[Ossama Othman]

Hi,
I have made the following changes to meegotouchcp-sync in project Trunk:Handset. Please review and accept ASAP.

Thank You,
Ossama Othman

[This message was auto-generated]

---

Request #9275:

  submit:   devel:ux:handset/meegotouchcp-sync(r3) -> Trunk:Handset/meegotouchcp-sync


Message:
    Fix build failures (BMC #9780), and sync service profile visibility (BMC #8069).

State:   new          2010-11-08T10:28:13 oothman
Comment: None



changes files:
--------------
--- meegotouchcp-sync.changes
+++ meegotouchcp-sync.changes
@@ -0,0 +1,7 @@
+* Mon Nov 08 2010 Ossama Othman <ossama.othman at intel.com> - 0.0.2
+
+  - Address build failures caused by Buteo API changes.  Fixes BMC#
+    9780.
+  - Added run-time package dependency on
+    buteo-sync-plugins-servicedescriptions.  Fixes BMC# 8069.
+

old:
----
  meegotouchcp-sync-0.0.1.tar.bz2

new:
----
  meegotouchcp-sync-0.0.2.tar.bz2

spec files:
-----------
--- meegotouchcp-sync.spec
+++ meegotouchcp-sync.spec
@@ -7,7 +7,7 @@
 
 Name:       meegotouchcp-sync
 Summary:    MeegoTouch control panel sync plugin
-Version:    0.0.1
+Version:    0.0.2
 Release:    1
 Group:      System/GUI/Other
 License:    Apache License, Version 2.0
@@ -15,7 +15,9 @@
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  meegotouchcp-sync.yaml
 Requires:   buteo-syncfw
-BuildRequires:  pkgconfig(QtCore) >= 4.6.0
+Requires:   buteo-sync-plugins
+Requires:   buteo-sync-plugins-servicedescriptions
+BuildRequires:  pkgconfig(QtCore) >= 4.7.0
 BuildRequires:  pkgconfig(QtDBus)
 BuildRequires:  pkgconfig(QtOpenGL)
 BuildRequires:  pkgconfig(QtGui)
@@ -30,7 +32,6 @@
 
 
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -59,15 +60,9 @@
 # << install post
 
 
-
-
-
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/duicontrolpanel/meegotouchcp-sync.desktop
 %{_libdir}/duicontrolpanel/applets/libsyncapplet.so
 # >> files
 # << files
-
-

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

++++++ meegotouchcp-sync-0.0.1.tar.bz2 -> meegotouchcp-sync-0.0.2.tar.bz2
--- common.pri
+++ common.pri
@@ -1,4 +1,4 @@
-VERSION=0.1
+VERSION=0.0.2
 M_PREFIX= $$INSTALL_ROOT/usr
 M_INSTALL_DATA= $$M_PREFIX/share
 OBJECTS_DIR = .obj
--- meegotouchcp-sync.yaml
+++ meegotouchcp-sync.yaml
-Name: meegotouchcp-sync
-Summary: MeegoTouch control panel sync plugin
-Version: 0.0.1
-Release: 1
-Group: System/GUI/Other
-License: Apache License, Version 2.0
-URL: http://www.meego.com/
-Sources:
-    - "%{name}-%{version}.tar.bz2"
-Description: |
-    A sync settings plugin for MeegoTouch control panel.
-    
-Requires: 
-    - buteo-syncfw
-PkgBR:
-    - doxygen
-    - buteo-syncfw-devel
-PkgConfigBR:
-    - QtCore >= 4.6.0
-    - QtDBus
-    - QtOpenGL
-    - QtGui
-    - meegotouch
-    - meegotouch-controlpanel
-Configure: none
-Builder: make
-Files: 
-- "%{_libdir}/duicontrolpanel/meegotouchcp-sync.desktop"
-- "%{_libdir}/duicontrolpanel/applets/libsyncapplet.so"
-
--- src/detailswidget.cpp
+++ src/detailswidget.cpp
@@ -94,6 +94,6 @@
   if (username.isEmpty() || password.isEmpty())
     changeWidget(ACCOUNT_WIDGET_ID);
 
-  m_sci->addProfile(*m_profile);
+//   m_sci->addProfile(*m_profile);
   m_sci->startSync(m_profile->name());
 }
--- src/setupwidget.cpp
+++ src/setupwidget.cpp
@@ -47,8 +47,8 @@
     {
     public:
 
-//     virtual MWidget * createCell (QModelIndex const & index,
-// 				  MWidgetRecycler & recycler) const
+//      virtual MWidget * createCell (QModelIndex const & index,
+// 				   MWidgetRecycler & recycler) const
 //     {
 //       // Create an MContentItem with a single line style.
 //       ...
@@ -80,8 +80,8 @@
 
 MeeGo::Sync::ProfileModel::~ProfileModel()
 {
-  foreach(Buteo::SyncProfile * p, m_profiles)
-    delete p;
+  qDeleteAll(m_profiles);
+  m_profiles.clear();
 }
 
 int

++++++ meegotouchcp-sync.yaml
--- meegotouchcp-sync.yaml
+++ meegotouchcp-sync.yaml
@@ -1,6 +1,6 @@
 Name: meegotouchcp-sync
 Summary: MeegoTouch control panel sync plugin
-Version: 0.0.1
+Version: 0.0.2
 Release: 1
 Group: System/GUI/Other
 License: Apache License, Version 2.0
@@ -12,11 +12,13 @@
     
 Requires: 
     - buteo-syncfw
+    - buteo-sync-plugins
+    - buteo-sync-plugins-servicedescriptions
 PkgBR:
     - doxygen
     - buteo-syncfw-devel
 PkgConfigBR:
-    - QtCore >= 4.6.0
+    - QtCore >= 4.7.0
     - QtDBus
     - QtOpenGL
     - QtGui