[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=8e73da3

The following commit has been merged in the master branch:
commit 8e73da39e112dd7c9a733e7adbd9676655e15862
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 10 19:29:44 2009 +0000

    Don't forget to register the Telepathy DBus types before we use tpqt4.
    
    BUG: 203354
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1009753
---
 src/kcm-telepathy-accounts.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index ee23f3d..1d07be2 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -31,6 +31,7 @@
 #include <TelepathyQt4/Account>
 #include <TelepathyQt4/PendingOperation>
 #include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/Types>
 
 
 K_PLUGIN_FACTORY(KCMTelepathyAccountsFactory, registerPlugin<KCMTelepathyAccounts>();)
@@ -44,6 +45,9 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
 {
     kDebug();
 
+    // The first thing we must do is register Telepathy DBus Types.
+    Tp::registerTypes();
+
     // Start setting up the Telepathy AccountManager.
     m_accountManager = Tp::AccountManager::create();
 

-- 
ktp-accounts-kcm packaging