[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=d5f28d4

The following commit has been merged in the master branch:
commit d5f28d47e6c5ea069506784798908fc3c9c782b2
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Sun Jan 1 15:50:46 2012 +0100

    Use KTp::Presence in few more places to make presence messages work
    
    REVIEW: 103600
---
 dialogs/custom-presence-dialog.cpp | 8 ++++----
 global-presence-chooser.cpp        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index ce3a6b0..11aadb9 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -86,10 +86,10 @@ void CustomPresenceDialog::setupDialog()
 
     m_statusMessage = new KComboBox(true, mainDialogWidget);
 
-    m_statusMessage->addItem(KIcon("user-online"), i18n("Set custom available message..."),qVariantFromValue(Tp::Presence::available()));
-    m_statusMessage->addItem(KIcon("user-busy"), i18n("Set custom busy message..."), qVariantFromValue(Tp::Presence::busy()));
-    m_statusMessage->addItem(KIcon("user-away"), i18n("Set custom away message..."), qVariantFromValue(Tp::Presence::away()));
-    m_statusMessage->addItem(KIcon("user-away-extended"), i18n("Set custom extended away message..."), qVariantFromValue(Tp::Presence::xa()));
+    m_statusMessage->addItem(KIcon("user-online"), i18n("Set custom available message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::available()));
+    m_statusMessage->addItem(KIcon("user-busy"), i18n("Set custom busy message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::busy()));
+    m_statusMessage->addItem(KIcon("user-away"), i18n("Set custom away message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::away()));
+    m_statusMessage->addItem(KIcon("user-away-extended"), i18n("Set custom extended away message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::xa()));
 
     m_statusMessage->setAutoCompletion(false);
     m_statusMessage->show();
diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index de97aaf..8ebfc1c 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -270,7 +270,7 @@ bool GlobalPresenceChooser::event(QEvent *e)
         QKeyEvent *ke = static_cast<QKeyEvent*>(e);
 
         if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) {
-            Tp::Presence presence = itemData(currentIndex(), PresenceModel::PresenceRole).value<Tp::Presence>();
+            KTp::Presence presence = itemData(currentIndex(), PresenceModel::PresenceRole).value<KTp::Presence>();
             presence.setStatus(presence.type(), presence.status(), lineEdit()->text());
             QModelIndex newPresence = m_model->addPresence(presence); //m_model->addPresence(presence);
             setEditable(false);

-- 
ktp-contact-list packaging