[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=fca7db4

The following commit has been merged in the master branch:
commit fca7db4e2a221128dac29dfbdff1b17dde2cbbba
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Jan 24 14:09:02 2013 +0100

    Insert proper value to the accounts hash
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 0ab6cba..b0067bf 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -269,6 +269,10 @@ NepomukStorage::NepomukStorage(QObject *parent)
 
 NepomukStorage::~NepomukStorage()
 {
+    kDebug();
+//     if (!m_runningJobs.isEmpty()) {
+//         m_aboutToBeDestroyed = true;
+//     }
 }
 
 void NepomukStorage::init()
@@ -339,7 +343,7 @@ void NepomukStorage::init()
 
             // If it does have a telepathy identifier, then it is added to the cache.
             AccountResources acRes( imAccount, it["protocol"].literal().toString() );
-            m_accounts.insert( identifier, imAccount );
+            m_accounts.insert( identifier, acRes );
         }
 
         QTimer::singleShot( 0, this, SLOT(onAccountsQueryFinishedListing()) );

-- 
ktp-common-internals packaging