[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=7e783b3

The following commit has been merged in the master branch:
commit 7e783b37c96750c7593929f5bcd400af35147fd5
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Fri Apr 3 10:52:00 2009 +0000

    Fix to compile with latest tpqt4 API.
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=948604
---
 presence/src/presence.cpp | 7 +++++--
 presence/src/presence.h   | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index b7c60e3..93ea068 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -31,7 +31,6 @@
 
 #include <TelepathyQt4/Types>
 #include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Client/PendingReadyAccountManager>
 #include <TelepathyQt4/Client/PendingReady>
 #include <TelepathyQt4/Client/Account>
 
@@ -104,7 +103,11 @@ void PresenceApplet::init()
                                    QVariant("status-message"), Qt::DisplayRole);
     //setup Telepathy Account Manager
     m_accountManager = new Telepathy::Client::AccountManager(QDBusConnection::sessionBus());
-    connect(m_accountManager->becomeReady(),
+    
+    QSet<Telepathy::Client::Feature> features;
+    features << Telepathy::Client::AccountManager::FeatureCore;
+    
+    connect(m_accountManager->becomeReady(features),
             SIGNAL(finished(Telepathy::Client::PendingOperation *)), this,
             SLOT(onReady(Telepathy::Client::PendingOperation *)));
 
diff --git a/presence/src/presence.h b/presence/src/presence.h
index 89034b9..148c3eb 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -32,8 +32,6 @@ namespace Plasma
 #include <QtGui/QLabel>
 #include <QtGui/QStandardItemModel>
 
-
-#include <TelepathyQt4/Client/PendingReadyAccountManager>
 #include <TelepathyQt4/Client/AccountManager>
 
 class KColorScheme;

-- 
ktp-contact-applet packaging