[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=60c38ed

The following commit has been merged in the master branch:
commit 60c38ed3778a3f3914b05315579f6f839474cb3b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Apr 10 23:04:22 2013 +0200

    Bring new/enabled accounts to current global presence
    
    Right now the accounts are always connected as online, which among other
    things breaks global presence. With this patch the newly added or
    enabled accounts are always connected to the current global presence.
    
    Reviewed-by: David Edmundson
    BUG: 293944
    FIXED-IN: 0.6.1
---
 src/add-account-assistant.cpp  | 7 ++++++-
 src/kcm-telepathy-accounts.cpp | 6 +++++-
 src/kcm-telepathy-accounts.h   | 2 ++
 src/salut-enabler.cpp          | 7 ++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index dccb3a3..e1181a7 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -23,6 +23,7 @@
 #include "add-account-assistant.h"
 
 #include <KTp/wallet-utils.h>
+#include <KTp/global-presence.h>
 
 #include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
 #include "KCMTelepathyAccounts/abstract-account-ui.h"
@@ -72,6 +73,7 @@ public:
     KPageWidgetItem *pageOne;
     KPageWidgetItem *pageTwo;
     KPageWidgetItem *pageThree;
+    KTp::GlobalPresence *globalPresence;
 };
 
 AddAccountAssistant::AddAccountAssistant(Tp::AccountManagerPtr accountManager, QWidget *parent)
@@ -80,6 +82,9 @@ AddAccountAssistant::AddAccountAssistant(Tp::AccountManagerPtr accountManager, Q
 {
     d->accountManager = accountManager;
 
+    d->globalPresence = new KTp::GlobalPresence(this);
+    d->globalPresence->setAccountManager(accountManager);
+
     // Set up the pages of the Assistant.
     d->profileListModel          = new ProfileListModel(this);
     d->profileSelectWidget       = new ProfileSelectWidget(d->profileListModel, this, true);
@@ -275,7 +280,7 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
     }
 
     if (d->accountEditWidget->connectOnAdd()) {
-        account->setRequestedPresence(Tp::Presence::available());
+        account->setRequestedPresence(d->globalPresence->requestedPresence());
     }
     account->setServiceName(d->currentProfileItem->serviceName());
     KAssistantDialog::accept();
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index f00c0f5..03caf66 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -49,6 +49,7 @@
 #include <KTp/wallet-utils.h>
 #include <KTp/Models/accounts-list-model.h>
 #include <KTp/logs-importer.h>
+#include <KTp/global-presence.h>
 
 #include <TelepathyQt/Account>
 #include <TelepathyQt/AccountSet>
@@ -99,6 +100,7 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
                                                                        << Tp::Account::FeatureProfile);
 
     m_accountManager = Tp::AccountManager::create(accountFactory);
+    m_globalPresence = new KTp::GlobalPresence(this);
 
     connect(m_accountManager->becomeReady(),
             SIGNAL(finished(Tp::PendingOperation*)),
@@ -234,7 +236,7 @@ void KCMTelepathyAccounts::onAccountEnabledChanged(const QModelIndex &index, boo
         // connect the account
         Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
         if (!account.isNull()) {
-            account->setRequestedPresence(Tp::Presence::available());
+            account->setRequestedPresence(m_globalPresence->requestedPresence());
         }
     }
 }
@@ -249,6 +251,8 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
     }
 
     m_accountsListModel->setAccountSet(m_accountManager->validAccounts());
+    m_globalPresence->setAccountManager(m_accountManager);
+
 }
 
 void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index e66f68e..665152f 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -36,6 +36,7 @@ class KProgressDialog;
 
 namespace KTp {
     class AccountsListModel;
+    class GlobalPresence;
 }
 
 namespace Tp {
@@ -89,6 +90,7 @@ private:
     QSortFilterProxyModel *m_accountsFilterModel;
     const QSortFilterProxyModel *m_currentModel;
     const QListView *m_currentListView;
+    KTp::GlobalPresence *m_globalPresence;
 
     QWeakPointer<SalutEnabler> m_salutEnabler;
     KPixmapSequenceOverlayPainter *m_salutBusyWheel;
diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index a45e3da..bfed729 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -33,6 +33,7 @@
 #include <KLocalizedString>
 
 #include <QtGui/QFrame>
+#include <KTp/global-presence.h>
 
 #include "salut-details-dialog.h"
 #include "salut-message-widget.h"
@@ -67,6 +68,7 @@ public:
     SalutMessageWidget *messageWidget;
     QWeakPointer<QFrame> salutMessageFrame;
     QString displayName;
+    KTp::GlobalPresence *globalPresence;
 };
 
 SalutEnabler::SalutEnabler(const Tp::AccountManagerPtr accountManager, QObject *parent)
@@ -75,6 +77,9 @@ SalutEnabler::SalutEnabler(const Tp::AccountManagerPtr accountManager, QObject *
 {
     d->accountManager = accountManager;
 
+    d->globalPresence = new KTp::GlobalPresence(this);
+    d->globalPresence->setAccountManager(accountManager);
+
     d->connectionManager = Tp::ConnectionManager::create(salutConnManager);
     connect(d->connectionManager->becomeReady(),
             SIGNAL(finished(Tp::PendingOperation*)),
@@ -252,7 +257,7 @@ void SalutEnabler::onAccountCreated(Tp::PendingOperation* op)
         return;
     }
 
-    pendingAccount->account()->setRequestedPresence(Tp::Presence::available());
+    pendingAccount->account()->setRequestedPresence(d->globalPresence->requestedPresence());
     pendingAccount->account()->setServiceName(d->profile->serviceName());
 
     d->salutMessageFrame.data()->deleteLater();;

-- 
ktp-accounts-kcm packaging