Merge lp:~tiagosh/telephony-service/fix-observer-crash into lp:telephony-service

[Tiago Salem Herrmann]

Keep reference of observer pointer so it doesn't get deleted.

Keep reference of observer pointer so it doesn't get deleted.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1126
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/570/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/238

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/570/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

=== modified file 'libtelephonyservice/telepathyhelper.cpp'
--- libtelephonyservice/telepathyhelper.cpp	2015-07-02 03:22:47 +0000
+++ libtelephonyservice/telepathyhelper.cpp	2015-10-20 19:27:09 +0000
@@ -48,6 +48,7 @@
       mDefaultCallAccount(NULL),
       mDefaultMessagingAccount(NULL),
       mChannelObserver(0),
+      mChannelObserverPtr(NULL),
       mFirstTime(true),
       mConnected(false),
       mHandlerInterface(0),
@@ -245,10 +246,11 @@
     }
 
     if (mChannelObserver) {
-        mChannelObserver->deleteLater();
+        unregisterClient(mChannelObserver);
     }
 
     mChannelObserver = new ChannelObserver(this);
+    mChannelObserverPtr = Tp::AbstractClientPtr(mChannelObserver);
     if (registerClient(mChannelObserver, name)) {
         // messages
         connect(mChannelObserver, SIGNAL(textChannelAvailable(Tp::TextChannelPtr)),
@@ -266,6 +268,7 @@
 {
     unregisterClient(mChannelObserver);
     mChannelObserver->deleteLater();
+    mChannelObserverPtr.reset();
     mChannelObserver = NULL;
     Q_EMIT channelObserverUnregistered();
 }

=== modified file 'libtelephonyservice/telepathyhelper.h'
--- libtelephonyservice/telepathyhelper.h	2015-06-10 21:05:50 +0000
+++ libtelephonyservice/telepathyhelper.h	2015-10-20 19:27:09 +0000
@@ -147,6 +147,7 @@
     AccountEntry *mDefaultCallAccount;
     AccountEntry *mDefaultMessagingAccount;
     ChannelObserver *mChannelObserver;
+    Tp::AbstractClientPtr mChannelObserverPtr;
     bool mFirstTime;
     bool mConnected;
     bool mMmsGroupChat;