Merge lp:~tiagosh/telepathy-ofono/fix-imei into lp:telepathy-ofono

[Tiago Salem Herrmann]

Set modem serial when it changes

Set modem serial when it changes

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telepathy-ofono) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/121/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'connection.cpp'
--- connection.cpp	2014-08-25 23:26:11 +0000
+++ connection.cpp	2014-09-10 19:33:44 +0000
@@ -202,6 +202,7 @@
     plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(contactsIface));
 
     QObject::connect(mOfonoModem, SIGNAL(onlineChanged(bool)), SLOT(updateOnlineStatus()));
+    QObject::connect(mOfonoModem, SIGNAL(serialChanged(QString)), supplementaryServicesIface.data(), SLOT(setSerial(QString)));
     QObject::connect(mOfonoModem, SIGNAL(interfacesChanged(QStringList)), SLOT(updateOnlineStatus()));
     QObject::connect(mOfonoMessageManager, SIGNAL(incomingMessage(QString,QVariantMap)), this, SLOT(onOfonoIncomingMessage(QString,QVariantMap)));
     QObject::connect(mOfonoMessageManager, SIGNAL(immediateMessage(QString,QVariantMap)), this, SLOT(onOfonoImmediateMessage(QString,QVariantMap)));

=== modified file 'ussdiface.h'
--- ussdiface.h	2014-04-02 21:51:42 +0000
+++ ussdiface.h	2014-09-10 19:33:44 +0000
@@ -61,24 +61,24 @@
 
     QString state() const;
     QString serial() const;
+
+public Q_SLOTS:
+    void NotificationReceived(const QString &message);
+    void RequestReceived(const QString &message);
+
+    void InitiateUSSDComplete(const QString &ussdResp);
+    void RespondComplete(bool success, const QString &ussdResp);
+    void BarringComplete(const QString &ssOp, const QString &cbService, const QVariantMap &cbMap);
+    void ForwardingComplete(const QString &ssOp, const QString &cfService, const QVariantMap &cfMap);
+    void WaitingComplete(const QString &ssOp, const QVariantMap &cwMap);
+    void CallingLinePresentationComplete(const QString &ssOp, const QString &status);
+    void ConnectedLinePresentationComplete(const QString &ssOp, const QString &status);
+    void CallingLineRestrictionComplete(const QString &ssOp, const QString &status);
+    void ConnectedLineRestrictionComplete(const QString &ssOp, const QString &status);
+    void InitiateFailed();
+    void StateChanged(const QString &state);
+
     void setSerial(const QString& serial) const;
-
-public Q_SLOTS:
-    void NotificationReceived(const QString &message);
-    void RequestReceived(const QString &message);
-
-    void InitiateUSSDComplete(const QString &ussdResp);
-    void RespondComplete(bool success, const QString &ussdResp);
-    void BarringComplete(const QString &ssOp, const QString &cbService, const QVariantMap &cbMap);
-    void ForwardingComplete(const QString &ssOp, const QString &cfService, const QVariantMap &cfMap);
-    void WaitingComplete(const QString &ssOp, const QVariantMap &cwMap);
-    void CallingLinePresentationComplete(const QString &ssOp, const QString &status);
-    void ConnectedLinePresentationComplete(const QString &ssOp, const QString &status);
-    void CallingLineRestrictionComplete(const QString &ssOp, const QString &status);
-    void ConnectedLineRestrictionComplete(const QString &ssOp, const QString &status);
-    void InitiateFailed();
-    void StateChanged(const QString &state);
-
 protected:
     BaseConnectionUSSDInterface();