Fix memory leak.

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index dfb40f336af8c4d967e05618706c502f22da5fd5..209f12ce1825b486b9c825bd6e210e9522d82058 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -28,7 +28,6 @@
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "callback.h"
 #include "Color.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
@@ -145,9 +144,37 @@ using support::prefixIs;
 
 namespace Alert = frontend::Alert;
 
+extern bool quitting;
 
 namespace {
 
+// This function runs "configure" and then rereads lyx.defaults to
+// reconfigure the automatic settings.
+void reconfigure(LyXView & lv, string const & option)
+{
+       // emit message signal.
+       lv.message(_("Running configure..."));
+
+       // Run configure in user lyx directory
+       support::Path p(package().user_support());
+       string configure_command = package().configure_command();
+       configure_command += option;
+       Systemcall one;
+       one.startscript(Systemcall::Wait, configure_command);
+       p.pop();
+       // emit message signal.
+       lv.message(_("Reloading configuration..."));
+       lyxrc.read(support::libFileSearch(string(), "lyxrc.defaults"));
+       // Re-read packages.lst
+       LaTeXFeatures::getAvailable();
+
+       Alert::information(_("System reconfigured"),
+                          _("The system has been reconfigured.\n"
+                            "You need to restart LyX to make use of any\n"
+                            "updated document class specifications."));
+}
+
+
 bool getLocalStatus(Cursor cursor, FuncRequest const & cmd, FuncStatus & status)
 {
        // Try to fix cursor in case it is broken.
@@ -934,17 +961,17 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                docstring const str = bformat(_("Saving document %1$s..."),
                                         makeDisplayPath(lyx_view_->buffer()->fileName()));
                                lyx_view_->message(str);
-                               menuWrite(lyx_view_->buffer());
+                               lyx_view_->buffer()->menuWrite();
                                lyx_view_->message(str + _(" done."));
                        } else {
-                               writeAs(lyx_view_->buffer());
+                               lyx_view_->buffer()->writeAs();
                        }
                        updateFlags = Update::None;
                        break;
 
                case LFUN_BUFFER_WRITE_AS:
                        BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
-                       writeAs(lyx_view_->buffer(), argument);
+                       lyx_view_->buffer()->writeAs(argument);
                        updateFlags = Update::None;
                        break;
 
@@ -958,10 +985,10 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                do {
                                        if (!b->isClean()) {
                                                if (!b->isUnnamed()) {
-                                                       menuWrite(b);
+                                                       b->menuWrite();
                                                        lyxerr[Debug::ACTION] << "Saved " << b->fileName() << endl;
                                                } else
-                                                       writeAs(b);
+                                                       b->writeAs();
                                        }
                                        b = theBufferList().next(b);
                                } while (b != first); 
@@ -1188,7 +1215,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
 
                case LFUN_BUFFER_AUTO_SAVE:
-                       autoSave(view());
+                       lyx_view_->buffer()->autoSave();
                        break;
 
                case LFUN_RECONFIGURE:
@@ -1287,11 +1314,16 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        updateFlags = Update::None;
                        break;
 
-               case LFUN_FILE_NEW:
+               case LFUN_FILE_NEW: {
                        BOOST_ASSERT(lyx_view_);
-                       newFile(*lyx_view_, argument);
+                       string name;
+                       string tmpname = split(argument, name, ':'); // Split filename
+                       Buffer * const b = newFile(name, tmpname);
+                       if (b)
+                               lyx_view_->setBuffer(b);
                        updateFlags = Update::None;
                        break;
+               }
 
                case LFUN_FILE_OPEN:
                        BOOST_ASSERT(lyx_view_);