[meego-commits] 7134: Changes to Trunk:Handset/meego-handset-sms

[Emma Kuo]

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

Thank You,
Emma Kuo

[This message was auto-generated]

---

Request #7134:

  submit:   devel:ux:handset/meego-handset-sms(r32) -> Trunk:Handset/meego-handset-sms


Message:
    Fixes: BMC#5884 align with QMF API changes

State:   new          2010-08-27T09:43:30 ekuo
Comment: None



changes files:
--------------
--- meego-handset-sms.changes
+++ meego-handset-sms.changes
@@ -0,0 +1,3 @@
+* Fri Aug 27 2010 Emma Kuo <emma.kuo at intel.com> 0.0.25
+- Fixes: BMC#5884 align with QMF API changes
+

old:
----
  meego-handset-sms-0.0.24.tar.bz2

new:
----
  meego-handset-sms-0.0.25.tar.bz2

spec files:
-----------
--- meego-handset-sms.spec
+++ meego-handset-sms.spec
@@ -7,7 +7,7 @@
 
 Name:       meego-handset-sms
 Summary:    MeeGo Touch Framework based SMS Application
-Version:    0.0.24
+Version:    0.0.25
 Release:    1
 Group:      System/GUI/Other
 License:    Apache License, Version 2.0

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

++++++ meego-handset-sms-0.0.24.tar.bz2 -> meego-handset-sms-0.0.25.tar.bz2
--- common.pri
+++ common.pri
@@ -5,7 +5,7 @@
 M_THEME_DIR = $$M_INSTALL_DATA/themes/
 
 isEmpty(QMF_INSTALL_ROOT) {
-    QMF_INSTALL_ROOT = /usr/lib/qt4
+    QMF_INSTALL_ROOT = /usr/lib/qmf
 }
 
 isEmpty(QMF_INCLUDE_PATH) {
--- plugin/smsservice.cpp
+++ plugin/smsservice.cpp
@@ -140,8 +140,10 @@
     return true;
 }
 
-bool SmsService::cancelOperation()
+bool SmsService::cancelOperation(QMailServiceAction::Status::ErrorCode code, const QString &text)
 {
+    Q_UNUSED(code);
+    Q_UNUSED(text);
     return true;
 }
 
--- plugin/smsservice.h
+++ plugin/smsservice.h
@@ -44,7 +44,7 @@
     virtual bool hasSource() const;
     virtual QMailMessageSource &source() const;
 public slots:
-    virtual bool cancelOperation();
+    virtual bool cancelOperation(QMailServiceAction::Status::ErrorCode, const QString&);
 private slots:
     void messagesUpdated(const QMailMessageIdList&);
     void messagesRemoved(const QMailMessageIdList&);

++++++ meego-handset-sms.yaml
--- meego-handset-sms.yaml
+++ meego-handset-sms.yaml
@@ -1,6 +1,6 @@
 Name: meego-handset-sms
 Summary: MeeGo Touch Framework based SMS Application
-Version: 0.0.24
+Version: 0.0.25
 Release: 1
 Group: System/GUI/Other
 License: Apache License, Version 2.0