Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.14'

Browse Source 
Conflicts:
	libvncserver/lzoconf.h
	libvncserver/lzodefs.h
	libvncserver/minilzo.c
	libvncserver/minilzo.h
This commit is contained in:
Albert Astals Cid
2014-09-11 00:49:42 +02:00
parent 1c85dc7d85 b6b20c84e8
commit 9db3ae6629
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
krfb/invitationsrfbserver.cpp
View File

@@ -54,8 +54,10 @@ void InvitationsRfbServer::init()
instance->m_wallet = Wallet::openWallet(
Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
connect(instance->m_wallet, SIGNAL(walletOpened(bool)),
instance, SLOT(walletOpened(bool)));
if(instance->m_wallet) {
connect(instance->m_wallet, SIGNAL(walletOpened(bool)),
instance, SLOT(walletOpened(bool)));
}
}
const QString& InvitationsRfbServer::desktopPassword() const
@@ -121,7 +123,7 @@ InvitationsRfbServer::~InvitationsRfbServer()
KSharedConfigPtr config = KGlobal::config();
KConfigGroup krfbConfig(config,"Security");
krfbConfig.writeEntry("allowUnattendedAccess",m_allowUnattendedAccess);
if(m_wallet->isOpen()) {
if(m_wallet && m_wallet->isOpen()) {
if( (m_wallet->currentFolder()=="krfb") ||
((m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb")) &&
@@ -150,6 +152,7 @@ void InvitationsRfbServer::walletOpened(bool opened)
{
QString desktopPassword;
QString unattendedPassword;
Q_ASSERT(m_wallet);
if( opened &&
( m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb") ) &&
m_wallet->setFolder("krfb") ) {