Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

diff --combined src/lib/server_finder.cc
index f347132e452a7f3dc0fa1caf996d4ea5e4988c31,b4b400b523edb1cf0f525f40b547df7462a671ae..726437ea57b3eaa14fdea90667c38a053f5963cb
--- 1/src/lib/server_finder.cc
--- 2/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@@ -22,7 -22,6 +22,6 @@@
  #include "util.h"
  #include "config.h"
  #include "cross.h"
- #include "ui_signaller.h"
  #include "dcpomatic_socket.h"
  #include "raw_convert.h"
  #include <libcxml/cxml.h>
@@@ -167,13 -166,13 +166,13 @@@ ServerFinder::handle_accept (boost::sys
        xml->read_string (s);
        
        string const ip = socket->socket().remote_endpoint().address().to_string ();
 -      if (!server_found (ip)) {
 +      if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
                ServerDescription sd (ip, xml->number_child<int> ("Threads"));
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        _servers.push_back (sd);
                }
-               ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd));
+               emit (boost::bind (boost::ref (ServerFound), sd));
        }
  
        start_accept ();