Point fix, earlier forgotten

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index dab4e37d65bb9ea72d33cf152c420df579201514..2699d8156d53ec4972fc5199c9a311ed760310de 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1,12 +1,16 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyx_cb.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- *         Copyright 1995 Matthias Ettrich,
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
@@ -35,6 +39,7 @@
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/path.h"
+#include "support/path_defines.h"
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
@@ -336,8 +341,7 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
                bv->getLyXText()->insertStringAsLines(tmpstr);
        else
                bv->getLyXText()->insertStringAsParagraphs(tmpstr);
-       if (flag)
-               bv->update(BufferView::SELECT);
+       bv->update();
 }
 
 
@@ -430,7 +434,7 @@ string const getPossibleLabel(BufferView const & bv)
            lyxrc.label_init_length < 0)
                text.erase();
 
-       string par_text = pit->asString(bv.buffer(), false);
+       string par_text = pit->asString(*bv.buffer(), false);
        for (int i = 0; i < lyxrc.label_init_length; ++i) {
                if (par_text.empty())
                        break;
@@ -453,10 +457,10 @@ void Reconfigure(BufferView * bv)
        bv->owner()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
-       Path p(user_lyxdir);
+       Path p(user_lyxdir());
        Systemcall one;
        one.startscript(Systemcall::Wait,
-                       AddName(system_lyxdir, "configure"));
+                       AddName(system_lyxdir(), "configure"));
        p.pop();
        bv->owner()->message(_("Reloading configuration..."));
        lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));