summaryrefslogtreecommitdiffstats
path: root/src/bluetooth
diff options
context:
space:
mode:
authorMichael Zanetti <michael.zanetti@nokia.com>2011-10-04 11:06:57 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-07 03:28:17 +0200
commit6a36e6e292cc13d559693686cfd2394894bcd1fa (patch)
treed185c2890b17c2debf6a322db4a19ba62fa30a37 /src/bluetooth
parentee26c3cb2f681e5b5bf65fbea14f2cec53b4224d (diff)
fix initialisation of service variable
Change-Id: I6f231ccd25f8441f699132fb22396fb03323e1fa Reviewed-on: http://codereview.qt-project.org/5973 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/bluetooth')
-rw-r--r--src/bluetooth/qbluetoothtransferreply_bluez.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp
index 07f1fb7c..d9e28efa 100644
--- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp
+++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp
@@ -79,6 +79,7 @@ QBluetoothTransferReplyBluez::QBluetoothTransferReplyBluez(QIODevice *input, QOb
qDebug() << "Failed Creating dbus objects";
#ifdef NOKIA_BT_SERVICES
+ m_obexService = NULL;
connectToObexServerService();
#endif
}
@@ -90,6 +91,10 @@ QBluetoothTransferReplyBluez::~QBluetoothTransferReplyBluez()
{
QDBusConnection::sessionBus().unregisterObject(m_agent_path);
delete client;
+
+#ifdef NOKIA_BT_SERVICES
+ delete m_obexService;
+#endif
}
bool QBluetoothTransferReplyBluez::start()
@@ -133,11 +138,10 @@ void QBluetoothTransferReplyBluez::connectToObexServerService()
}
if (m_obexService) {
qDebug() << "connected to service:" << m_obexService;
+ connect(m_obexService, SIGNAL(errorUnrecoverableIPCFault(QService::UnrecoverableIPCError)), SLOT(sfwIPCError(QService::UnrecoverableIPCError)));
} else {
qDebug() << "failed to connect to Obex server service";
}
-
- connect(m_obexService, SIGNAL(errorUnrecoverableIPCFault(QService::UnrecoverableIPCError)), SLOT(sfwIPCError(QService::UnrecoverableIPCError)));
}
#endif