rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix SSL fingerprint text and about box copyright text

This commit is contained in:
walker0643 2018-01-27 20:50:30 -05:00
parent 99b16334b5
commit 0929086428
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/src/AboutDialogBase.ui
View File

@ -52,7 +52,7 @@
<property name="text"> <property name="text">
<string>&lt;p&gt; <string>&lt;p&gt;
Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt; Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
Copyright © 2012-2018 Debauchee Open Source Group&lt;br /&gt; Copyright © 2018 Debauchee Open Source Group&lt;br /&gt;
Copyright © 2012-2016 Symless Ltd.&lt;br /&gt; Copyright © 2012-2016 Symless Ltd.&lt;br /&gt;
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt; Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
Barrier is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt; Barrier is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;

8
src/gui/src/MainWindow.cpp
View File

@ -133,6 +133,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
m_pComboServerList->hide(); m_pComboServerList->hide();
m_pLabelPadlock->hide(); m_pLabelPadlock->hide();
sslToggled(appConfig.getCryptoEnabled());
connect (this, SIGNAL(windowShown()), connect (this, SIGNAL(windowShown()),
this, SLOT(on_windowShown()), Qt::QueuedConnection); this, SLOT(on_windowShown()), Qt::QueuedConnection);
@ -494,12 +496,6 @@ void MainWindow::restartBarrier()
void MainWindow::proofreadInfo() void MainWindow::proofreadInfo()
{ {
if (m_AppConfig->getCryptoEnabled()) {
m_pSslCertificate = new SslCertificate(this);
m_pSslCertificate->generateCertificate();
}
updateLocalFingerprint();
saveSettings();
int oldState = m_BarrierState; int oldState = m_BarrierState;
m_BarrierState = barrierDisconnected; m_BarrierState = barrierDisconnected;
setBarrierState((qBarrierState)oldState); setBarrierState((qBarrierState)oldState);