Fix my breakage. Sorry guys.

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 9009677032c6919e29a9c677a1e4b12d249e2381..24dbdb8afc88189c3f25bd7f8bb3381c858a21bf 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -34,14 +34,13 @@
 #include "frontends/lyx_gui.h"
 #include "frontends/LyXView.h"
 
+#include "support/filefilterlist.h"
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/forkedcall.h"
-#include "support/globbing.h"
 #include "support/lyxlib.h"
-#include "support/os.h"
+#include "support/package.h"
 #include "support/path.h"
-#include "support/path_defines.h"
 #include "support/systemcall.h"
 
 #include <boost/shared_ptr.hpp>
@@ -62,16 +61,14 @@ using lyx::support::MakeDisplayPath;
 using lyx::support::OnlyFilename;
 using lyx::support::OnlyPath;
 using lyx::support::Path;
+using lyx::support::package;
+using lyx::support::QuoteName;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
 using lyx::support::split;
-using lyx::support::system_lyxdir;
 using lyx::support::Systemcall;
 using lyx::support::tempName;
 using lyx::support::unlink;
-using lyx::support::user_lyxdir;
-
-namespace os = lyx::support::os;
 
 using boost::shared_ptr;
 
@@ -204,11 +201,11 @@ void QuitLyX()
        bufferlist.closeAll();
 
        // do any other cleanup procedures now
-       lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl;
+       lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
 
-       if (destroyDir(os::getTmpDir()) != 0) {
+       if (destroyDir(package().temp_dir()) != 0) {
                string msg = bformat(_("Could not remove the temporary directory %1$s"),
-                       os::getTmpDir());
+                       package().temp_dir());
                Alert::warning(_("Could not remove temporary directory"), msg);
        }
 
@@ -242,7 +239,7 @@ private:
 int AutoSaveBuffer::start()
 {
        command_ = bformat(_("Auto-saving %1$s"), fname_);
-       return runNonBlocking();
+       return run(DontWait);
 }
 
 
@@ -443,16 +440,18 @@ void Reconfigure(BufferView * bv)
        bv->owner()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
-       Path p(user_lyxdir());
+       Path p(package().user_support());
+       string const configure_script =
+               AddName(package().system_support(), "configure");
+       string const configure_command = "sh " + QuoteName(configure_script);
        Systemcall one;
-       one.startscript(Systemcall::Wait,
-                       AddName(system_lyxdir(), "configure"));
+       one.startscript(Systemcall::Wait, configure_command);
        p.pop();
        bv->owner()->message(_("Reloading configuration..."));
        lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
 
        Alert::information(_("System reconfigured"),
                _("The system has been reconfigured.\n"
-               "You need to restart LyX to make use of any \n"
+               "You need to restart LyX to make use of any\n"
                "updated document class specifications."));
 }