diff --git a/uppsrc/CtrlCore/TopWinX11.cpp b/uppsrc/CtrlCore/TopWinX11.cpp index 9f7dbcb7a..deea6f181 100644 --- a/uppsrc/CtrlCore/TopWinX11.cpp +++ b/uppsrc/CtrlCore/TopWinX11.cpp @@ -77,7 +77,7 @@ void TopWindow::DefSyncTitle() } } -void TopWindow::SyncTitle() +void TopWindow::SyncTitle0() { GuiLock __; LLOG("SyncTitle: " << title); diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp index 9cdd7be12..6e0438702 100644 --- a/uppsrc/CtrlCore/X11App.cpp +++ b/uppsrc/CtrlCore/X11App.cpp @@ -370,6 +370,10 @@ void SetX11ErrorHandler() XSetErrorHandler(X11ErrorHandler); } +void WakeUpGuiThread() +{ +} + void Ctrl::InitX11(const char *display) { GuiLock __; diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp index 5acb5811a..c1ed0fa09 100644 --- a/uppsrc/CtrlCore/X11Wnd.cpp +++ b/uppsrc/CtrlCore/X11Wnd.cpp @@ -300,9 +300,10 @@ bool Ctrl::ProcessEvents(bool *) return false; } -void Ctrl::GuiSleep0(int ms) +void Ctrl::GuiSleep(int ms) { GuiLock __; + ASSERT(IsMainThread()); fd_set fdset; FD_ZERO(&fdset); FD_SET(Xconnection, &fdset); @@ -315,11 +316,6 @@ void Ctrl::GuiSleep0(int ms) EnterGuiMutex(level); } -void Ctrl::GuiSleep(int ms) -{ - Call(&Ctrl::GuiSleep0, ms); -} - static int granularity = 10; void Ctrl::SetTimerGranularity(int ms)