add missing bits to gtk port

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7924 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 773bddf88665f12bc36bd90efe7a101a3cee4b54..8ac73a75d5b2e6cb4c3b37322c742c1bee151cf3 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-15  José Matos  <jamatos@lyx.org>
+
+       * lyx_gui.C (start): add lyxsocket.
+       (LyX_XErrHandler): fix call to emergencyCleanup.
+
 2003-10-14  Angus Leeming  <leeming@lyx.org>
 
        * lyx_gui.C (start): store the LyXView in the LyX list of all LyXViews.

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 99aeab74458163b7221600bee02103024616bd1d..05a988d467aa544b654e3787e67e626c1c296e04 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -36,6 +36,7 @@
 #include "buffer_funcs.h"
 #include "lyxfunc.h"
 #include "lyxserver.h"
+#include "lyxsocket.h"
 #include "BufferView.h"
 
 #include "GView.h"
@@ -54,6 +55,8 @@
 #include "xformsImage.h"
 #include "xforms_helpers.h"
 
+namespace os = lyx::support::os;
+
 using std::ostringstream;
 using std::string;
 
@@ -62,6 +65,7 @@ extern BufferList bufferlist;
 
 // FIXME: wrong place !
 LyXServer * lyxserver;
+LyXServerSocket * lyxsocket;
 
 bool lyx_gui::use_gui = true;
 
@@ -117,7 +121,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev) {
        }
 
        // emergency cleanup
-       LyX::emergencyCleanup();
+       LyX::cref().emergencyCleanup();
 
        // Get the reason for the crash.
        char etxt[513];
@@ -326,6 +330,8 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
        // FIXME: some code below needs moving
 
        lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes);
+       lyxsocket = new LyXServerSocket(&view.getLyXFunc(),
+                         os::slashify_path(os::getTmpDir() + "/lyxsocket"));
 
        std::vector<string>::const_iterator cit = files.begin();
        std::vector<string>::const_iterator end = files.end();
@@ -353,6 +359,7 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
        }
 
        // FIXME: breaks emergencyCleanup
+       delete lyxsocket;
        delete lyxserver;
 }