[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=ebfcfa2

The following commit has been merged in the master branch:
commit ebfcfa20029338b785dc1de817b156a8fe980c8e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue May 26 19:28:38 2015 +0200

    [kaccounts] Account manager is always needed, move back to ctor
---
 plugins/kaccounts/kaccounts-ui-provider.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index 539706b..39d6b97 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -79,6 +79,14 @@ KAccountsUiProvider::KAccountsUiProvider(QObject *parent)
     d->reconnectRequired = false;
 
     Tp::registerTypes();
+
+    Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
+                                                                       Tp::Features() << Tp::Account::FeatureCore
+                                                                       << Tp::Account::FeatureCapabilities
+                                                                       << Tp::Account::FeatureProtocolInfo
+                                                                       << Tp::Account::FeatureProfile);
+    d->accountManager = Tp::AccountManager::create(accountFactory);
+    d->accountManager->becomeReady();
 }
 
 KAccountsUiProvider::~KAccountsUiProvider()
@@ -100,12 +108,6 @@ void KAccountsUiProvider::init(KAccountsUiPlugin::UiType type)
         if (d->accountManager->isReady()) {
             Q_EMIT uiReady();
         } else {
-            Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
-                                                                               Tp::Features() << Tp::Account::FeatureCore
-                                                                               << Tp::Account::FeatureCapabilities
-                                                                               << Tp::Account::FeatureProtocolInfo
-                                                                               << Tp::Account::FeatureProfile);
-            d->accountManager = Tp::AccountManager::create(accountFactory);
             // let's wait for AM to become ready first
             connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::uiReady);
         }

-- 
ktp-accounts-kcm packaging