Dekels tabular/textinset patches

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 4b7305055b00ab4e6c10718607bb746b6e9e5c3f..eded1682963cb2f8568ccf3366fe50a6ee37448f 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -14,6 +14,7 @@
 #include "buffer.h"
 #include "gettext.h"
 #include "support/filetools.h"
+#include "support/lyxlib.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
 
@@ -185,7 +186,7 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
-       switch (vcs->stat()) {
+       switch (vcs->status()) {
        case VCS::UNLOCKED:
                lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
                checkOut();
@@ -279,7 +280,7 @@ void LyXVC::viewLog(string const & fil)
                fl_raise_form(browser->LaTeXLog);
        } else {
                fl_show_form(browser->LaTeXLog,
-                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
+                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
                             _("VC History"));
                if (ow < 0) {
                        ow = browser->LaTeXLog->w;
@@ -292,8 +293,8 @@ void LyXVC::viewLog(string const & fil)
 
 void LyXVC::showLog()
 {
-       string tmpf = tmpnam(0);
+       string tmpf = lyx::tempName(string(), "lyxvclog");
        vcs->getLog(tmpf);
        viewLog(tmpf);
-       unlink(tmpf.c_str());
+       lyx::unlink(tmpf);
 }