Merge branch 'master' of openslx.org:pvs

Conflicts:
	i18n/pvs_ar_JO.ts
	i18n/pvs_de_DE.ts
	i18n/pvs_es_MX.ts
	i18n/pvs_fr_FR.ts
	i18n/pvs_pl_PL.ts

1 files changed, 0 insertions, 30 deletions

diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp
index 25f1cd6..6fdd673 100644
--- a/src/pvsgui.cpp
+++ b/src/pvsgui.cpp
@@ -76,18 +76,6 @@ PVSGUI::PVSGUI(QWidget *parent) :
     if (dbus.isConnected())
         qDebug("[%s] Connection to DBus successful!", metaObject()->className());
 
-    // TODO: perhaps this can go if fadi does his work
-    // check if vnc is allowed and setup checkbox
-    QFile file(QDir::toNativeSeparators(QDir::homePath() + "/.pvs/.allow"));
-    if (file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        QTextStream in(&file);
-        QString line = in.readLine();
-        if (line == "1")
-            vncCheckBox->setChecked(true);
-        file.close();
-    }
-
     // listen on port 29481 for incoming file transfers
     _serverSocket = new QTcpServer();
     _serverSocket->listen(QHostAddress::Any, 29481);
@@ -108,8 +96,6 @@ PVSGUI::PVSGUI(QWidget *parent) :
     connect(_hostMenu, SIGNAL(aboutToHide()), this, SLOT(hide()));
     connect(_hostMenu, SIGNAL(triggered(QAction*)), this,
             SLOT(pvsConnect(QAction*)));
-    connect(vncCheckBox, SIGNAL(stateChanged(int)), this,
-            SLOT(setVncAllow(int)));
 
     // signals & slots - dbus
     connect(_ifaceDBus, SIGNAL(showMessage(QString, QString, bool)), this,
@@ -392,22 +378,6 @@ void PVSGUI::delHost(QString host)
     }
 }
 
-// TODO: perhaps this can go if fadi does his work
-void PVSGUI::setVncAllow(int i)
-{
-    QFile file(QDir::toNativeSeparators(QDir::homePath() + "/.pvs/.allow"));
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
-        return;
-
-    QTextStream out(&file);
-    if (i == 0)
-        out << 0;
-    else
-        out << 1;
-
-    file.close();
-}
-
 void PVSGUI::sendFile()
 {
     ClientFileSendDialog *d = new ClientFileSendDialog();