[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=ba17058

The following commit has been merged in the master branch:
commit ba170586cb6cd934e8ee30d5382c6380789517ec
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Mon Jan 3 17:00:41 2011 +0000

    Controller Test: Fix possible crash.
---
 kpeople/nepomuk-feeder/tests/controller-test.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/tests/controller-test.cpp b/kpeople/nepomuk-feeder/tests/controller-test.cpp
index 44ea19f..7c73b84 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/controller-test.cpp
@@ -89,7 +89,8 @@ void OnNewAccountFakeStorage::destroyAccount(const QString &path)
 
 
 ControllerTest::ControllerTest(QObject *parent)
-  : Test(parent)
+  : Test(parent),
+    m_controller(0)
 {
     kDebug();
 }
@@ -218,6 +219,7 @@ void ControllerTest::cleanupTestCase()
     // Clear re-used member variables.
     if (m_controller) {
         m_controller->deleteLater();
+        m_controller = 0;
     }
 
     m_accountManager.reset();

-- 
ktp-common-internals packaging