LFUN_SERVER_GET_NAME -> LFUN_SERVER_GET_FILENAME.

Make the naming unambiguous.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25491 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0d859d91a615d2cafe5b7a5ac66e5d022cba78d8..3a4cfa6a76310dac8601a43838ff5c05693f1dbc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,6 +74,9 @@ Some of the LyX functions have changed names:
 - The functions LFUN_FONT_FREE_APPLY/UPDATE has been renamed to
   LFUN_TEXTSTYLE_APPLY/UPDATE.
 
+- The functions LFUN_SERVER_GET_NAME has been renamed to
+  LFUN_SERVER_GET_FILENAME.
+
 
 The following new LyX functions have been introduced:
 

diff --git a/src/FuncCode.h b/src/FuncCode.h
index 412a9fddab0e82d1745792d918179e575e6406f0..f2fcbd73eff02271170067cc6210d9938d3084cb 100644 (file)
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -136,7 +136,7 @@ enum FuncCode
        LFUN_SERVER_CHAR_AFTER,
        LFUN_LINEATCURSOR,
        LFUN_SERVER_GET_LAYOUT,
-       LFUN_SERVER_GET_NAME,
+       LFUN_SERVER_GET_FILENAME,
        // 90
        LFUN_SERVER_NOTIFY,
        LFUN_SERVER_GOTO_FILE_ROW,

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 0dd1f39df05c544fabbd4a93691ee6505e5506e1..7b9e95bc06e24586e0f9c89372b6a89cbb82badf 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -2314,7 +2314,13 @@ void LyXAction::init()
 
                { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly, System },
                { LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly, System },
-               { LFUN_SERVER_GET_NAME, "server-get-name", ReadOnly, System },
+/*!
+ * \var lyx::FuncCode lyx::LFUN_SERVER_GET_FILENAME
+ * \li Action: Returns path and file name of the currently edited document.
+ * \li Syntax: server-get-filename
+ * \endvar
+ */
+               { LFUN_SERVER_GET_FILENAME, "server-get-filename", ReadOnly, System },
 /*!
  * \var lyx::FuncCode lyx::LFUN_SERVER_GOTO_FILE_ROW
  * \li Action: Sets the cursor position based on the row number of generated TeX file.

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 6a3db5bb8559c086dcc1db2b4096cd755988c9f9..a97abefde4fbc4986fa35431ab14c70aded47cce 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -564,7 +564,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_HELP_OPEN:
        case LFUN_DROP_LAYOUTS_CHOICE:
        case LFUN_MENU_OPEN:
-       case LFUN_SERVER_GET_NAME:
+       case LFUN_SERVER_GET_FILENAME:
        case LFUN_SERVER_NOTIFY:
        case LFUN_SERVER_GOTO_FILE_ROW:
        case LFUN_DIALOG_HIDE:
@@ -1079,7 +1079,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
 
                // --- lyxserver commands ----------------------------
-               case LFUN_SERVER_GET_NAME:
+               case LFUN_SERVER_GET_FILENAME:
                        LASSERT(lyx_view_ && lyx_view_->buffer(), /**/);
                        setMessage(from_utf8(lyx_view_->buffer()->absFileName()));
                        LYXERR(Debug::INFO, "FNAME["