#6338 Only use Zeroconf if non-enterprise build
This commit is contained in:
parent
d2d2a5e1d9
commit
c0452f0e61
|
@ -79,9 +79,9 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
|
|||
:
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
m_LicenseManager(&licenseManager),
|
||||
m_pZeroconf(nullptr),
|
||||
m_ActivationDialogRunning(false),
|
||||
#endif
|
||||
m_pZeroconf(nullptr),
|
||||
m_Settings(settings),
|
||||
m_AppConfig(&appConfig),
|
||||
m_pSynergy(NULL),
|
||||
|
@ -178,9 +178,8 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
|
|||
m_pActivate->setVisible(false);
|
||||
#endif
|
||||
|
||||
m_pZeroconf = new Zeroconf(this);
|
||||
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
m_pZeroconf = new Zeroconf(this);
|
||||
if (m_AppConfig->autoConfig()) {
|
||||
m_pZeroconf->startService();
|
||||
}
|
||||
|
@ -195,9 +194,7 @@ MainWindow::~MainWindow()
|
|||
}
|
||||
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
if (m_AppConfig->autoConfig()) {
|
||||
m_pZeroconf->stopService();
|
||||
}
|
||||
delete m_pZeroconf;
|
||||
#endif
|
||||
|
||||
saveSettings();
|
||||
|
@ -1302,6 +1299,7 @@ void MainWindow::on_m_pComboServerList_currentIndexChanged(const QString &arg1)
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
int MainWindow::raiseActivationDialog()
|
||||
{
|
||||
if (m_ActivationDialogRunning) {
|
||||
|
@ -1325,6 +1323,7 @@ int MainWindow::raiseActivationDialog()
|
|||
}
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
|
||||
void MainWindow::on_windowShown()
|
||||
{
|
||||
|
|
|
@ -203,10 +203,10 @@ public slots:
|
|||
private:
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
LicenseManager* m_LicenseManager;
|
||||
Zeroconf* m_pZeroconf;
|
||||
bool m_ActivationDialogRunning;
|
||||
QStringList m_PendingClientNames;
|
||||
#endif
|
||||
Zeroconf* m_pZeroconf;
|
||||
QSettings& m_Settings;
|
||||
AppConfig* m_AppConfig;
|
||||
QProcess* m_pSynergy;
|
||||
|
|
|
@ -189,10 +189,12 @@ void SettingsDialog::on_m_pLabelInstallBonjour_linkActivated(const QString&)
|
|||
|
||||
void SettingsDialog::on_m_pCheckBoxAutoConfig_toggled(bool checked)
|
||||
{
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
if (checked) {
|
||||
m_pMainWindow->zeroconf().startService();
|
||||
}
|
||||
else {
|
||||
m_pMainWindow->zeroconf().stopService();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue