Transform the name of the temp dir on Windows with GetLongPathName.

[lyx.git] / src / lyxsocket.C

diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index bad14b65d195cd475c2b305846b26311f558a120..29a2480aa04438ae2d7ebe6c1453c4d50dcb47d1 100644 (file)
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -21,6 +21,7 @@
 
 #include "frontends/lyx_gui.h"
 
+#include "support/environment.h"
 #include "support/lyxlib.h"
 #include "support/socktools.h"
 
@@ -50,13 +51,13 @@ LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
 
        // These env vars are used by DVI inverse search
        // Needed by xdvi
-       lyx::support::putenv("XEDITOR", "lyxclient -g %f %l");
+       lyx::support::setEnv("XEDITOR", "lyxclient -g %f %l");
        // Needed by lyxclient
-       lyx::support::putenv("LYXSOCKET", address_);
+       lyx::support::setEnv("LYXSOCKET", address_);
 
        lyx_gui::register_socket_callback(
                fd_,
-               boost::bind(&LyXServerSocket::serverCallback, *this)
+               boost::bind(&LyXServerSocket::serverCallback, this)
                );
 
        lyxerr[Debug::LYXSERVER] << "lyx: New server socket "
@@ -103,7 +104,7 @@ void LyXServerSocket::serverCallback()
        lyx_gui::register_socket_callback(
                client_fd,
                boost::bind(&LyXServerSocket::dataCallback,
-                           *this, client_fd)
+                           this, client_fd)
                );
 }