[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=3dc159b

The following commit has been merged in the master branch:
commit 3dc159ba58695dca945ec6bc54532e5c71a83807
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Oct 12 14:35:21 2012 +0100

    Update AccountsComboBox to work
---
 KTp/Widgets/accounts-combo-box.cpp | 4 ++--
 KTp/Widgets/accounts-combo-box.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Widgets/accounts-combo-box.cpp b/KTp/Widgets/accounts-combo-box.cpp
index b504500..d427e9b 100644
--- a/KTp/Widgets/accounts-combo-box.cpp
+++ b/KTp/Widgets/accounts-combo-box.cpp
@@ -39,9 +39,9 @@ KTp::AccountsComboBox::AccountsComboBox(QWidget *parent) :
     setModel(d->model);
 }
 
-void KTp::AccountsComboBox::setAccountManager(const Tp::AccountManager &accountManager)
+void KTp::AccountsComboBox::setAccountManager(const Tp::AccountManagerPtr &accountManager)
 {
-    //    d->model->settAccountManager(accountManager);
+    d->model->setAccountManager(accountManager);
 }
 
 Tp::AccountPtr KTp::AccountsComboBox::currentAccount()
diff --git a/KTp/Widgets/accounts-combo-box.h b/KTp/Widgets/accounts-combo-box.h
index b3ba55e..92d6d99 100644
--- a/KTp/Widgets/accounts-combo-box.h
+++ b/KTp/Widgets/accounts-combo-box.h
@@ -33,7 +33,7 @@ public:
     explicit AccountsComboBox(QWidget *parent = 0);
 
 public:
-    void setAccountManager(const Tp::AccountManager &accountManager);
+    void setAccountManager(const Tp::AccountManagerPtr &accountManager);
     Tp::AccountPtr currentAccount();
 
 private:

-- 
ktp-common-internals packaging