X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=3d73a67ed6d955c08318323357856f5ec10aa8f9;hb=ec84cbfb445413e51472845c3c1a2b5da930492f;hp=6d3368a517b1c44a2811f94812fa81fb04d8a8b2;hpb=377cdd5f6cc2dd67fabd0b03703d20722a9ed0ea;p=lyx.git

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 6d3368a517..3d73a67ed6 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -28,7 +28,7 @@
 #include "support/FileName.h"
 #include "support/socktools.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <cerrno>
 #include <ostream>
@@ -40,7 +40,6 @@
 using namespace std;
 using namespace lyx::support;
 
-using boost::shared_ptr;
 
 namespace lyx {
 
@@ -60,15 +59,15 @@ ServerSocket::ServerSocket(FileName const & addr)
 	// Needed by xdvi
 	setEnv("XEDITOR", "lyxclient -g %f %l");
 	// Needed by lyxclient
-	setEnv("LYXSOCKET", address_.absFilename());
+	setEnv("LYXSOCKET", address_.absFileName());
 
 	theApp()->registerSocketCallback(
 		fd_,
-		boost::bind(&ServerSocket::serverCallback, this)
+		bind(&ServerSocket::serverCallback, this)
 		);
 
 	LYXERR(Debug::LYXSERVER, "lyx: New server socket "
-				 << fd_ << ' ' << address_.absFilename());
+				 << fd_ << ' ' << address_.absFileName());
 }
 
 
@@ -90,7 +89,7 @@ ServerSocket::~ServerSocket()
 
 string const ServerSocket::address() const
 {
-	return address_.absFilename();
+	return address_.absFileName();
 }
 
 
@@ -115,7 +114,7 @@ void ServerSocket::serverCallback()
 		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
 	theApp()->registerSocketCallback(
 		client_fd,
-		boost::bind(&ServerSocket::dataCallback,
+		bind(&ServerSocket::dataCallback,
 			    this, client_fd)
 		);
 }
@@ -125,8 +124,10 @@ void ServerSocket::serverCallback()
 // if the connection has been closed
 void ServerSocket::dataCallback(int fd)
 {
-	shared_ptr<LyXDataSocket> client = clients[fd];
-
+	map<int, shared_ptr<LyXDataSocket> >::const_iterator it = clients.find(fd);
+	if (it == clients.end())
+		return;
+	shared_ptr<LyXDataSocket> client = it->second;
 	string line;
 	size_t pos;
 	bool saidbye = false;
@@ -141,8 +142,10 @@ void ServerSocket::dataCallback(int fd)
 		string const key = line.substr(0, pos);
 		if (key == "LYXCMD") {
 			string const cmd = line.substr(pos + 1);
+			FuncRequest fr(lyxaction.lookupFunc(cmd));
+			fr.setOrigin(FuncRequest::LYXSERVER);
 			DispatchResult dr;
-			theApp()->dispatch(lyxaction.lookupFunc(cmd), dr);
+			theApp()->dispatch(fr, dr);
 			string const rval = to_utf8(dr.message());
 			if (dr.error())
 				client->writeln("ERROR:" + cmd + ':' + rval);
@@ -189,7 +192,7 @@ void ServerSocket::writeln(string const & line)
 // void ServerSocket::dump() const
 // {
 //	lyxerr << "ServerSocket debug dump.\n"
-//	     << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
+//	     << "fd = " << fd_ << ", address = " << address_.absFileName() << ".\n"
 //	     << "Clients: " << clients.size() << ".\n";
 //	map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
 //	map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();