Merge remote-tracking branch 'origin/master' into gtk3

rtgui/filebrowser.cc

@@ -585,7 +585,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();

rtgui/main.cc

@@ -85,11 +85,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()
 {