Fix bug 2474; partial fix for 1777. Added last_reference_ member to QRef class and...

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index fbdf15cf842c8621404b09f346fbae8adf2189d9..548ff140d9446472f05af6f5299a7f01aa43dbf3 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -456,7 +456,7 @@ int LyX::exec(int & argc, char * argv[])
        // such that package().temp_dir() is properly initialized.
        pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
        pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_, 
-                       package().temp_dir().absFilename() + "/lyxsocket"));
+                       FileName(package().temp_dir().absFilename() + "/lyxsocket")));
 
        // Start the real execution loop.
        exit_status = pimpl_->application_->exec();
@@ -1130,8 +1130,8 @@ bool LyX::readUIFile(string const & name, bool include)
 {
        enum Uitags {
                ui_menuset = 1,
-               ui_toolbar,
                ui_toolbars,
+               ui_toolbarset,
                ui_include,
                ui_last
        };
@@ -1139,8 +1139,8 @@ bool LyX::readUIFile(string const & name, bool include)
        struct keyword_item uitags[ui_last - 1] = {
                { "include", ui_include },
                { "menuset", ui_menuset },
-               { "toolbar", ui_toolbar },
-               { "toolbars", ui_toolbars }
+               { "toolbars", ui_toolbars },
+               { "toolbarset", ui_toolbarset }
        };
 
        // Ensure that a file is read only once (prevents include loops)
@@ -1202,12 +1202,12 @@ bool LyX::readUIFile(string const & name, bool include)
                        menubackend.read(lex);
                        break;
 
-               case ui_toolbar:
-                       toolbarbackend.read(lex);
+               case ui_toolbarset:
+                       toolbarbackend.readToolbars(lex);
                        break;
 
                case ui_toolbars:
-                       toolbarbackend.readToolbars(lex);
+                       toolbarbackend.readToolbarSettings(lex);
                        break;
 
                default: