Commit e0cae54a authored by Leon Handreke's avatar Leon Handreke

Rename org.freedesktop.Telepathy -> im.telepathy.v1

parent 451996e6
......@@ -21,10 +21,10 @@
<unsupported-channel-classes>
<!-- this service doesn't support text roomlists -->
<channel-class>
<property name="org.freedesktop.Telepathy.Channel.TargetHandleType"
<property name="im.telepathy.v1.Channel.TargetHandleType"
type="u">3</property>
<property name="org.freedesktop.Telepathy.Channel.ChannelType"
type="s">org.freedesktop.Telepathy.Channel.Type.Text</property>
<property name="im.telepathy.v1.Channel.ChannelType"
type="s">im.telepathy.v1.Channel.Type.Text</property>
</channel-class>
</unsupported-channel-classes>
</service>
......@@ -24,10 +24,10 @@
<unsupported-channel-classes>
<!-- this service doesn't support text roomlists -->
<channel-class>
<property name="org.freedesktop.Telepathy.Channel.TargetHandleType"
<property name="im.telepathy.v1.Channel.TargetHandleType"
type="u">3</property>
<property name="org.freedesktop.Telepathy.Channel.ChannelType"
type="s">org.freedesktop.Telepathy.Channel.Type.Text</property>
<property name="im.telepathy.v1.Channel.ChannelType"
type="s">im.telepathy.v1.Channel.Type.Text</property>
</channel-class>
</unsupported-channel-classes>
</service>
......@@ -47,6 +47,9 @@
#include <TelepathyQt/PendingAccount>
#include <TelepathyQt/PendingOperation>
#define TP_PROP_ACCOUNT_ENABLED (QLatin1String("im.telepathy.v1.Account.Enabled"))
#define TP_PROP_ACCOUNT_SERVICE (QLatin1String("im.telepathy.v1.Account.Service"))
class AddAccountAssistant::Private
{
public:
......@@ -215,11 +218,11 @@ void AddAccountAssistant::accept()
// https://bugs.freedesktop.org/show_bug.cgi?id=33153
QVariantMap properties;
if (d->accountManager->supportedAccountProperties().contains(QLatin1String("org.freedesktop.Telepathy.Account.Service"))) {
properties.insert(QLatin1String("org.freedesktop.Telepathy.Account.Service"), d->currentProfileItem->serviceName());
if (d->accountManager->supportedAccountProperties().contains(TP_PROP_ACCOUNT_SERVICE)) {
properties.insert(TP_PROP_ACCOUNT_SERVICE, d->currentProfileItem->serviceName());
}
if (d->accountManager->supportedAccountProperties().contains(QLatin1String("org.freedesktop.Telepathy.Account.Enabled"))) {
properties.insert(QLatin1String("org.freedesktop.Telepathy.Account.Enabled"), true);
if (d->accountManager->supportedAccountProperties().contains(TP_PROP_ACCOUNT_ENABLED)) {
properties.insert(TP_PROP_ACCOUNT_ENABLED, true);
}
//remove password values from being sent. These are stored by KWallet instead
......
......@@ -249,7 +249,7 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
return;
}
m_accountsListModel->setAccountSet(m_accountManager->validAccounts());
m_accountsListModel->setAccountSet(m_accountManager->usableAccounts());
m_globalPresence->setAccountManager(m_accountManager);
}
......
......@@ -38,8 +38,8 @@
#include "salut-details-dialog.h"
#include "salut-message-widget.h"
#define TP_PROP_ACCOUNT_ENABLED (QLatin1String("org.freedesktop.Telepathy.Account.Enabled"))
#define TP_PROP_ACCOUNT_SERVICE (QLatin1String("org.freedesktop.Telepathy.Account.Service"))
#define TP_PROP_ACCOUNT_ENABLED (QLatin1String("im.telepathy.v1.Account.Enabled"))
#define TP_PROP_ACCOUNT_SERVICE (QLatin1String("im.telepathy.v1.Account.Service"))
const QLatin1String salutConnManager("salut");
const QLatin1String localXmppProtocol("local-xmpp");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment