* GuiView.cpp:

[lyx.git] / src / ServerSocket.cpp

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 063f3471c1afeca6595ee811d6d853032d1f768c..54088ec96deb45ee6da66fb8a4ee2de8a1af010f 100644 (file)
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -16,16 +16,15 @@
 
 #include "ServerSocket.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
-#include "support/lyxlib.h"
 #include "support/socktools.h"
 
 #include <boost/bind.hpp>
@@ -37,18 +36,19 @@
 # include <io.h>
 #endif
 
-using boost::shared_ptr;
-
 using namespace std;
+using namespace lyx::support;
+
+using boost::shared_ptr;
 
 namespace lyx {
 
 // Address is the unix address for the socket.
 // MAX_CLIENTS is the maximum number of clients
 // that can connect at the same time.
-ServerSocket::ServerSocket(LyXFunc * f, support::FileName const & addr)
+ServerSocket::ServerSocket(LyXFunc * f, FileName const & addr)
        : func(f),
-         fd_(support::socktools::listen(addr, 3)),
+         fd_(socktools::listen(addr, 3)),
          address_(addr)
 {
        if (fd_ == -1) {
@@ -58,9 +58,9 @@ ServerSocket::ServerSocket(LyXFunc * f, support::FileName const & addr)
 
        // These env vars are used by DVI inverse search
        // Needed by xdvi
-       support::setEnv("XEDITOR", "lyxclient -g %f %l");
+       setEnv("XEDITOR", "lyxclient -g %f %l");
        // Needed by lyxclient
-       support::setEnv("LYXSOCKET", address_.absFilename());
+       setEnv("LYXSOCKET", address_.absFilename());
 
        theApp()->registerSocketCallback(
                fd_,
@@ -80,7 +80,8 @@ ServerSocket::~ServerSocket()
                theApp()->unregisterSocketCallback(fd_);
                if (::close(fd_) != 0)
                        lyxerr << "lyx: Server socket " << fd_
-                              << " IO error on closing: " << strerror(errno);
+                              << " IO error on closing: " << strerror(errno)
+                              << endl;
        }
        address_.removeFile();
        LYXERR(Debug::LYXSERVER, "lyx: Server socket quitting");
@@ -97,7 +98,7 @@ string const ServerSocket::address() const
 // is OK and if the number of clients does not exceed MAX_CLIENTS
 void ServerSocket::serverCallback()
 {
-       int const client_fd = support::socktools::accept(fd_);
+       int const client_fd = socktools::accept(fd_);
 
        if (fd_ == -1) {
                LYXERR(Debug::LYXSERVER, "lyx: Failed to accept new client");