[meego-commits] 8295: 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 #8295:

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


Message:
    Fix: BMC#8026 allow "+" to be part of a valid phone number, Fix: BMC#7870 update app icon

State:   new          2010-10-11T10:25:23 ekuo
Comment: None



changes files:
--------------
--- meego-handset-sms.changes
+++ meego-handset-sms.changes
@@ -0,0 +1,4 @@
+* Mon Oct 11 2010 Emma Kuo <emma.kuo at intel.com> 0.0.29
+- Fix: BMC#8026 allow "+" to be part of a valid phone number
+- Fix: BMC#7870 update app icon
+

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

new:
----
  meego-handset-sms-0.0.29.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.28
+Version:    0.0.29
 Release:    1
 Group:      System/GUI/Other
 License:    Apache License, Version 2.0

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

++++++ meego-handset-sms-0.0.28.tar.bz2 -> meego-handset-sms-0.0.29.tar.bz2
--- AUTHORS
+++ AUTHORS
@@ -1,2 +1,2 @@
 Emma Kuo <emma.kuo at intel.com>
-
+Arun Ravindran <ext-arun.1.ravindran at nokia.com>
--- sms.desktop
+++ sms.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=SMS
-Icon=Appicon-SMS
+Icon=icons-Applications-sms
 Exec=sms
 Comment=MeeGo text messaging application
 Terminal=false
--- src/dialogpage.cpp
+++ src/dialogpage.cpp
@@ -245,7 +245,7 @@
 
 void DialogPage::sendClicked()
 {
-    QString phone = mAddressEntry->text();
+    QString phone = stripPhone(mAddressEntry->text());
     if (!mEntry->text().isEmpty() &&
             (!mPhone.isEmpty() || !phone.isEmpty())) {
         if (mPhone.isEmpty()) {
@@ -255,7 +255,7 @@
                 message.exec();
                 return;
             }
-            setDialogMode(stripPhone(phone));
+            setDialogMode(phone);
         }
         mBackend->send(mPhone, mEntry->text());
         mEntry->clear();
--- src/util.cpp
+++ src/util.cpp
@@ -41,11 +41,11 @@
 QString stripPhone(const QString &phone)
 {
     QString copy = phone;
-    copy.replace(QRegExp("[^0-9*#]"), "");
+    copy.replace(QRegExp("[^0-9+*#]"), "");
     return copy;
 }
 
 bool isValidPhone(const QString &phone)
 {
-    return phone.contains(QRegExp("[0-9]")) && !(phone.contains(QRegExp("[^0-9*#\\(\\) -]")));
+    return phone.contains(QRegExp("[0-9]")) && !(phone.contains(QRegExp("[^0-9+*#\\(\\) -]")));
 }

++++++ 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.28
+Version: 0.0.29
 Release: 1
 Group: System/GUI/Other
 License: Apache License, Version 2.0