summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_utils.h4
-rw-r--r--langpacks/english/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/english/Plugins/Scriver.txt2
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt2
-rw-r--r--langpacks/english/Plugins/Variables.txt6
-rw-r--r--plugins/Db_autobackups/src/options.cpp4
-rw-r--r--plugins/Import/src/miranda.cpp4
-rw-r--r--plugins/Scriver/src/chat/options.cpp4
-rw-r--r--plugins/TabSRMM/src/chat/options.cpp4
-rw-r--r--plugins/Variables/src/parse_miranda.cpp8
-rw-r--r--src/modules/utils/path.cpp2
11 files changed, 21 insertions, 21 deletions
diff --git a/include/m_utils.h b/include/m_utils.h
index 8d9abd0a3b..e28e2b44a1 100644
--- a/include/m_utils.h
+++ b/include/m_utils.h
@@ -363,14 +363,14 @@ __forceinline INT_PTR Utils_AssertInsideScreen(RECT *rc) {
// variables known by the core:
// ----------------------------
-// %miranda_profile% -> same as MS_DB_GETPROFILEPATH, base folder for all profiles
+// %miranda_profilesdir% -> same as MS_DB_GETPROFILEPATH, base folder for all profiles
// %miranda_userdata% -> the active profile folder (home of the .dat file and all
// profile data)
// %miranda_path% -> home path of the miranda installation (installation path
// of miranda32/64.exe
// %miranda_profilename% -> Name of the profile in use. Essentially, the name of the
// .dat file without file name extension. Also: the folder name
-// relative to %miranda_profile% where all profile data is stored.
+// relative to %miranda_profilesdir% where all profile data is stored.
// %miranda_logpath% -> base folder for log files. This is \Logs relative to the
// current profile folder.
// %miranda_avatarcache% -> base folder for all protocol avatars. internal use only.
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index c8f83c7434..950f057431 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -41,7 +41,7 @@
[path to Miranda root folder]
[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\%miranda_profilename%]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
["My Documents" folder for currently logged-on Windows user]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index f9e335c264..1b95edfbae 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -405,7 +405,7 @@
[path to Miranda root folder]
[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\%miranda_profilename%]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
[will return parsed string %miranda_userdata%\\Logs]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index b07b3d4760..4414cb80d1 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1071,7 +1071,7 @@
[path to Miranda root folder]
[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\%miranda_profilename%]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
[will return parsed string %miranda_userdata%\\Logs]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index bed883373e..d7a16b747f 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -95,9 +95,9 @@
[path to Miranda root folder]
[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\%miranda_profilename%]
-[will return parsed string %miranda_profile%\\%miranda_profilename%\\AvatarCache]
-[will return parsed string %miranda_profile%\%miranda_profilename%\\Logs]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%\\AvatarCache]
+[will return parsed string %miranda_profilesdir%\\%miranda_profilename%\\Logs]
[Miranda Core OS]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp
index 488a17dc0a..6faeb33ece 100644
--- a/plugins/Db_autobackups/src/options.cpp
+++ b/plugins/Db_autobackups/src/options.cpp
@@ -158,9 +158,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
TCHAR tszTooltipText[1024];
mir_sntprintf(tszTooltipText, SIZEOF(tszTooltipText), _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),
_T("%miranda_path%"), TranslateT("path to Miranda root folder"),
- _T("%miranda_profile%"), TranslateT("path to folder containing Miranda profiles"),
+ _T("%miranda_profilesdir%"), TranslateT("path to folder containing Miranda profiles"),
_T("%miranda_profilename%"), TranslateT("name of current Miranda profile (filename, without extension)"),
- _T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profile%\\%miranda_profilename%"),
+ _T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),
_T("%appdata%"), TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),
_T("%username%"), TranslateT("username for currently logged-on Windows user"),
_T("%mydocuments%"), TranslateT("\"My Documents\" folder for currently logged-on Windows user"),
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp
index 047212f816..44aab053de 100644
--- a/plugins/Import/src/miranda.cpp
+++ b/plugins/Import/src/miranda.cpp
@@ -71,7 +71,7 @@ INT_PTR CALLBACK MirandaPageProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM
{
VARST pfd(_T("%miranda_path%\\Profiles"));
VARST pfd1(_T("%miranda_path%"));
- VARST pfd2(_T("%miranda_profile%"));
+ VARST pfd2(_T("%miranda_profilesdir%"));
VARST pfn(_T("%miranda_profilename%"));
SearchForLists(hwndDlg, pfd2, pfn);
@@ -113,7 +113,7 @@ INT_PTR CALLBACK MirandaPageProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM
break;
case IDC_OTHER:
- ptrT pfd(Utils_ReplaceVarsT(_T("%miranda_profile%")));
+ ptrT pfd(Utils_ReplaceVarsT(_T("%miranda_profilesdir%")));
TCHAR str[MAX_PATH], text[256];
GetDlgItemText(hwndDlg, IDC_FILENAME, str, SIZEOF(str));
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 483c86ec8f..938130031d 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -376,9 +376,9 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
_T("%userid%"), TranslateT("user ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),
// global vars
_T("%miranda_path%"), TranslateT("path to Miranda root folder"),
- _T("%miranda_profile%"), TranslateT("path to folder containing Miranda profiles"),
+ _T("%miranda_profilesdir%"), TranslateT("path to folder containing Miranda profiles"),
_T("%miranda_profilename%"), TranslateT("name of current Miranda profile (filename, without extension)"),
- _T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profile%\\%miranda_profilename%"),
+ _T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),
_T("%miranda_logpath%"), TranslateT("will return parsed string %miranda_userdata%\\Logs"),
_T("%appdata%"), TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),
_T("%username%"), TranslateT("username for currently logged-on Windows user"),
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 81845f9f96..12567262b6 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -791,9 +791,9 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
_T("%userid%"), TranslateT("user ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),
// global vars
_T("%miranda_path%"), TranslateT("path to Miranda root folder"),
- _T("%miranda_profile%"), TranslateT("path to folder containing Miranda profiles"),
+ _T("%miranda_profilesdir%"), TranslateT("path to folder containing Miranda profiles"),
_T("%miranda_profilename%"), TranslateT("name of current Miranda profile (filename, without extension)"),
- _T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profile%\\%miranda_profilename%"),
+ _T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),
_T("%miranda_logpath%"), TranslateT("will return parsed string %miranda_userdata%\\Logs"),
_T("%appdata%"), TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),
_T("%username%"), TranslateT("username for currently logged-on Windows user"),
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index c612dda819..6516b5ea18 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -770,11 +770,11 @@ void registerMirandaTokens()
{
// global vars
registerIntToken(_T("miranda_path"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("path to Miranda root folder"));
- registerIntToken(_T("miranda_profile"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("path to folder containing Miranda profiles"));
+ registerIntToken(_T("miranda_profilesdir"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("path to folder containing Miranda profiles"));
registerIntToken(_T("miranda_profilename"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("name of current Miranda profile (filename, without extension)"));
- registerIntToken(_T("miranda_userdata"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("will return parsed string %miranda_profile%\\%miranda_profilename%"));
- registerIntToken(_T("miranda_avatarcache"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("will return parsed string %miranda_profile%\\%miranda_profilename%\\AvatarCache"));
- registerIntToken(_T("miranda_logpath"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("will return parsed string %miranda_profile%\\%miranda_profilename%\\Logs"));
+ registerIntToken(_T("miranda_userdata"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"));
+ registerIntToken(_T("miranda_avatarcache"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("will return parsed string %miranda_profilesdir%\\%miranda_profilename%\\AvatarCache"));
+ registerIntToken(_T("miranda_logpath"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core Global")"\t"LPGEN("will return parsed string %miranda_profilesdir%\\%miranda_profilename%\\Logs"));
// OS vars
registerIntToken(_T("appdata"), parseMirandaCoreVar, TRF_FIELD, LPGEN("Miranda Core OS")"\t"LPGEN("same as environment variable %APPDATA% for currently logged-on Windows user"));
diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp
index 0bd1e79383..1031718867 100644
--- a/src/modules/utils/path.cpp
+++ b/src/modules/utils/path.cpp
@@ -307,7 +307,7 @@ XCHAR *GetInternalVariable(XCHAR *key, size_t keyLength, MCONTACT hContact)
theValue = SHGetSpecialFolderPathX(CSIDL_PERSONAL, theKey);
else if (!_xcscmp(theKey, XSTR(key, "desktop")))
theValue = SHGetSpecialFolderPathX(CSIDL_DESKTOPDIRECTORY, theKey);
- else if (!_xcscmp(theKey, XSTR(key, "miranda_profile")))
+ else if (!_xcscmp(theKey, XSTR(key, "miranda_profilesdir")))
theValue = GetProfileDirX(key);
else if (!_xcscmp(theKey, XSTR(key, "miranda_profilename")))
theValue = GetProfileNameX(key);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:01:01 +0000