X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=d258cb5474e5621c99c32672b106137bedb602c0;hb=69bee02a8901793b34ac5ca6d07e93910cef4005;hp=ce70c08217ae46b5447f7e31f10f8c29fd24d13d;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index ce70c08217..d258cb5474 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -39,20 +39,19 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <cerrno>
-
 #include "lyxserver.h"
-#include "lyx_main.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "LyXAction.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "frontends/lyx_gui.h"
 
+#include <cerrno>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #ifdef __EMX__
 #include <cstdlib>
 #include <io.h>
@@ -63,10 +62,14 @@
 #include "support/os2_errortable.h"
 #endif
 
-
-using namespace lyx::support;
+using lyx::support::compare;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::unlink;
 
 using std::endl;
+using std::string;
+
 
 // provide an empty mkfifo() if we do not have one. This disables the
 // lyxserver.
@@ -139,6 +142,7 @@ void LyXComm::closeConnection()
 	ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
 	int fd;
@@ -479,7 +483,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 			// support currently. (Lgb)
 
 
-			serv->func->dispatch(cmd + ' ' + arg);
+			serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
 			string const rval = serv->func->getMessage();
 
 			//modified june 1999 stefano@zool.su.se: