Merge branch 'master' into cairocanvas

[ardour.git] / libs / pbd / signals.cc

diff --git a/libs/pbd/signals.cc b/libs/pbd/signals.cc
index 467ef02a12ae793de721d1badac9ef75df1a3810..ff535603ef41a85d937d07ec68ba3b37605cf939 100644 (file)
--- a/libs/pbd/signals.cc
+++ b/libs/pbd/signals.cc
@@ -22,8 +22,6 @@
 
 using namespace PBD;
 
-Glib::StaticMutex ScopedConnectionList::_lock = GLIBMM_STATIC_MUTEX_INIT;
-
 ScopedConnectionList::ScopedConnectionList()
 {
 }
@@ -36,14 +34,14 @@ ScopedConnectionList::~ScopedConnectionList()
 void
 ScopedConnectionList::add_connection (const UnscopedConnection& c)
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
        _list.push_back (new ScopedConnection (c));
 }
 
 void
 ScopedConnectionList::drop_connections ()
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
 
        for (ConnectionList::iterator i = _list.begin(); i != _list.end(); ++i) {
                delete *i;