Merge lp:~renatofilho/address-book-app/fix-1384707 into lp:address-book-app/rtm-14.09

[Renato Araujo Oliveira Filho]

Call "attach" on sync monitor server to notify a new client connection.
We need to notify sync-monitor that we are attached to him to start to receive signals.

[Bill Filler (bfiller)]

approved

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk. 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 on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed UI labels, did you update the pot file? NO LABEL CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2014-07-20 20:23:20 +0000
+++ src/app/addressbookapp.cpp	2014-10-31 20:09:53 +0000
@@ -221,6 +221,11 @@
 {
     unsetFirstRun();
 
+    if (m_syncMonitor) {
+        m_syncMonitor->call("detach");
+        delete m_syncMonitor;
+    }
+
     if (m_view) {
         delete m_view;
     }
@@ -438,9 +443,11 @@
                                        "com.canonical.SyncMonitor");
     if (m_syncMonitor->lastError().isValid()) {
         qWarning() << "Fail to connect with sync monitor:" << m_syncMonitor->lastError();
+    } else {
+        connect(m_syncMonitor, SIGNAL(stateChanged()), SIGNAL(syncingChanged()));
+        connect(m_syncMonitor, SIGNAL(enabledServicesChanged()), SIGNAL(syncEnabledChanged()));
+        m_syncMonitor->call("attach");
     }
-    connect(m_syncMonitor, SIGNAL(stateChanged()), SIGNAL(syncingChanged()));
-    connect(m_syncMonitor, SIGNAL(enabledServicesChanged()), SIGNAL(syncEnabledChanged()));
     Q_EMIT syncEnabledChanged();
     Q_EMIT syncingChanged();
 }