X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=28ec276986e026cbea2af837668c97efbd8fe903;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=16243172a912cfba662b4ca926cc649531eb6cdf;hpb=479abc6efdbfb69b3f9097fb89984768d287d74e;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 16243172a9..28ec276986 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -44,9 +44,9 @@
 #include "funcrequest.h"
 #include "LyXAction.h"
 #include "lyxfunc.h"
+#include "frontends/Application.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "frontends/lyx_gui.h"
 
 #include <boost/bind.hpp>
 
@@ -56,10 +56,13 @@
 #endif
 #include <fcntl.h>
 
-using lyx::support::compare;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::unlink;
+
+namespace lyx {
+
+using support::compare;
+using support::rtrim;
+using support::split;
+using support::unlink;
 
 using std::endl;
 using std::string;
@@ -189,7 +192,8 @@ int LyXComm::startPipe(string const & filename, bool write)
 	}
 
 	if (!write) {
-		lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
+		theApp->registerSocketCallback(fd,
+			boost::bind(&LyXComm::read_ready, this));
 	}
 
 	return fd;
@@ -202,7 +206,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 		return;
 
 	if (!write) {
-		lyx_gui::unregister_socket_callback(fd);
+		theApp->unregisterSocketCallback(fd);
 	}
 
 	if (::close(fd) < 0) {
@@ -456,7 +460,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 
 
 			serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
-			string const rval = serv->func->getMessage();
+			string const rval = to_utf8(serv->func->getMessage());
 
 			//modified june 1999 stefano@zool.su.se:
 			//all commands produce an INFO or ERROR message
@@ -495,3 +499,6 @@ void LyXServer::notifyClient(string const & s)
 	string buf = string("NOTIFY:") + s + "\n";
 	pipes.send(buf);
 }
+
+
+} // namespace lyx