← Back to branch summary

~telepathy-kde/telepathy-kde/ktp-auth-handler

« back to all changes in this revision

Viewing changes to sasl-auth-op.h

  • Committer: Aleix Pol
  • Date: 2014-11-13 12:36:32 UTC
  • mfrom: (132.1.28 trunk)
  • Revision ID: aleixpol@kde.org-20141113123632-3s6yi5hu0fu001du
Merge branch 'frameworks'

Conflicts:
        x-telepathy-password-prompt.ui

Show diffs side-by-side

added added

removed removed

Lines of Context:
sasl-auth-op.h
43
43
 
44
44
private Q_SLOTS:
45
45
    void gotProperties(Tp::PendingOperation *op);
46
 
    void onOpenWalletOperationFinished(Tp::PendingOperation *op);
47
46
    void onAuthOperationFinished(Tp::PendingOperation *op);
48
47
 
49
 
#ifdef HAVE_SSO
50
 
    //FIXME this is a workaround until Tp::Client::AccountInterfaceStorageInterface is merged into Tp::Account
51
 
    //https://bugs.freedesktop.org/show_bug.cgi?id=63191
52
 
    void onGetAccountStorageFetched(Tp::PendingOperation *op);
53
 
#endif
54
 
 
55
48
private:
56
49
    void setReady();
57
50
    KTp::WalletInterface *m_walletInterface;
58
51
    Tp::AccountPtr m_account;
59
52
    Tp::ChannelPtr m_channel;
60
53
    Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface;
61
 
 
62
 
#ifdef HAVE_SSO
63
 
    void fetchAccountStorage();
64
 
    int m_accountStorageId;
65
 
#endif
 
54
    quint32 m_kaccountsId;
66
55
};
67
56
 
68
57
#endif // SASL_AUTH_OP_H