Hi Angus,
I discovered that I need this for the gtk port to compile. I think that you
forgot some bits. :-)
Is the following patch ok?
--
José Abílio
LyX and docbook, a perfect match. :-)
Index: po/POTFILES.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/POTFILES.in,v
retrieving revision 1.360
diff -u -p -r1.360 POTFILES.in
--- po/POTFILES.in 10 Oct 2003 21:08:53 -0000 1.360
+++ po/POTFILES.in 15 Oct 2003 09:49:32 -0000
@@ -188,6 +188,7 @@ src/mathed/ref_inset.C
src/paragraph.C
src/paragraph_funcs.C
src/rowpainter.C
+src/support/path_defines.C
src/text.C
src/text2.C
src/text3.C
Index: src/frontends/gtk/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/lyx_gui.C,v
retrieving revision 1.12
diff -u -p -r1.12 lyx_gui.C
--- src/frontends/gtk/lyx_gui.C 14 Oct 2003 21:30:20 -0000 1.12
+++ src/frontends/gtk/lyx_gui.C 15 Oct 2003 09:49:32 -0000
@@ -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, X
}
// emergency cleanup
- LyX::emergencyCleanup();
+ LyX::cref().emergencyCleanup();
// Get the reason for the crash.
char etxt[513];
@@ -326,6 +330,9 @@ void lyx_gui::start(string const & batch
// 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 +360,7 @@ void lyx_gui::start(string const & batch
}
// FIXME: breaks emergencyCleanup
+ delete lyxsocket;
delete lyxserver;
}
