#6471 Reverted accidental change and fixed more tabs
This commit is contained in:
parent
207247b7ef
commit
6c6e2b6bd3
|
@ -74,7 +74,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
|
|||
synergyConnecting,
|
||||
synergyConnected,
|
||||
synergyListening,
|
||||
synergyPendingRetry
|
||||
synergyPendingRetry
|
||||
};
|
||||
|
||||
enum qSynergyType
|
||||
|
@ -139,7 +139,7 @@ public slots:
|
|||
void appendLogDebug(const QString& text);
|
||||
void appendLogError(const QString& text);
|
||||
void startSynergy();
|
||||
void retryStart(); // If the connection failed this will retry a startSynergy
|
||||
void retryStart(); // If the connection failed this will retry a startSynergy
|
||||
|
||||
protected slots:
|
||||
void sslToggled(bool enabled);
|
||||
|
|
|
@ -1303,7 +1303,7 @@ XWindowsUtil::getWindowProperty(Display* display, Window window,
|
|||
int actualDatumSize;
|
||||
|
||||
// ignore errors. XGetWindowProperty() will report failure.
|
||||
// XWindowsUtil::ErrorLock lock(display);
|
||||
XWindowsUtil::ErrorLock lock(display);
|
||||
|
||||
// read the property
|
||||
bool okay = true;
|
||||
|
|
Loading…
Reference in New Issue