From 9ce41d8e91958cc78fffdd81a095c4e1f4e65e68 Mon Sep 17 00:00:00 2001 From: Hombre Date: Tue, 31 Jan 2017 00:22:54 +0100 Subject: [PATCH] Fix deprecated Glib::RecMutex on Windows + remove useless GThreadEnter (no issue) --- rtgui/filebrowser.cc | 1 - rtgui/main.cc | 4 ---- 2 files changed, 5 deletions(-) diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index b11361db2..841c2082a 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -601,7 +601,6 @@ void FileBrowser::addEntry (FileBrowserEntry* entry) void FileBrowser::addEntry_ (FileBrowserEntry* entry) { - GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected entry->selected = false; entry->drawable = false; entry->framed = editedFiles.find (entry->filename) != editedFiles.end(); diff --git a/rtgui/main.cc b/rtgui/main.cc index a8ded72e5..d21904f23 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -89,11 +89,7 @@ Glib::ustring fname_to_utf8 (const char* fname) } // This recursive mutex will be used by gdk_threads_enter/leave instead of a simple mutex -#ifdef WIN32 -static Glib::RecMutex myGdkRecMutex; -#else static Glib::Threads::RecMutex myGdkRecMutex; -#endif static void myGdkLockEnter() {