diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/AVS/src/main.cpp | 4 | ||||
| -rw-r--r-- | plugins/BASS_interface/src/Main.cpp | 2 | ||||
| -rw-r--r-- | plugins/CrashDumper/src/crshdmp.cpp | 4 | ||||
| -rw-r--r-- | plugins/Db_autobackups/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/FlashAvatars/src/cflash.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirOTR/MirOTR/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/NewsAggregator/Src/Services.cpp | 2 | ||||
| -rw-r--r-- | plugins/PackUpdater/Src/PackUpdater.cpp | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/PluginUpdater.cpp | 2 | ||||
| -rw-r--r-- | plugins/Popup/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/Main.cpp | 2 | ||||
| -rw-r--r-- | plugins/SmileyAdd/src/download.cpp | 2 | ||||
| -rwxr-xr-x | plugins/StopSpamMod/src/init.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/mim.cpp | 8 | ||||
| -rw-r--r-- | plugins/TipperYM/src/tipper.cpp | 2 | ||||
| -rw-r--r-- | plugins/VersionInfo/src/hooked_events.cpp | 2 | 
17 files changed, 22 insertions, 22 deletions
| diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 0731748322..7e21146fca 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -1990,8 +1990,8 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)  	SetThreadPriority(hLoaderThread, THREAD_PRIORITY_IDLE);
  	// Folders plugin support
 -	hMyAvatarsFolder = FoldersRegisterCustomPathT("Avatars", "My Avatars", MIRANDA_USERDATAT _T("\\Avatars"));
 -	hGlobalAvatarFolder = FoldersRegisterCustomPathT("Avatars", "My Global Avatar Cache", MIRANDA_USERDATAT _T("\\Avatars"));
 +	hMyAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("My Avatars"), MIRANDA_USERDATAT _T("\\Avatars"));
 +	hGlobalAvatarFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("My Global Avatar Cache"), MIRANDA_USERDATAT _T("\\Avatars"));
  	g_AvatarHistoryAvail = ServiceExists(MS_AVATARHISTORY_ENABLED);
 diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 0d94cba08c..ad31987d7b 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -548,7 +548,7 @@ int OnFoldersChanged(WPARAM, LPARAM)  int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
  {
 -	if (hBASSFolder = FoldersRegisterCustomPathT("Bass Interface", "Bass library", PLUGINS_PATHT _T("\\Bass"))) {
 +	if (hBASSFolder = FoldersRegisterCustomPathT(LPGEN("Bass Interface"), LPGEN("Bass library"), PLUGINS_PATHT _T("\\Bass"))) {
  		FoldersGetCustomPathT(hBASSFolder, CurrBassPath, MAX_PATH, _T(""));
  		_tcscat(CurrBassPath, _T("\\bass.dll"));
  	}
 diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 5af1c0b20a..7d2af2bc90 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -246,8 +246,8 @@ static int ModulesLoaded(WPARAM, LPARAM)  	SetExceptionHandler();
 -	hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, "Crash Reports", CrashLogFolder);
 -	hVerInfoFolder  = FoldersRegisterCustomPathT(PluginName, "Version Information", VersionInfoFolder);
 +	hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Crash Reports"), CrashLogFolder);
 +	hVerInfoFolder  = FoldersRegisterCustomPathT(PluginName, LPGEN("Version Information"), VersionInfoFolder);
  	FoldersPathChanged(0, 0);
 diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp index d5c0116e75..b3122b99cb 100644 --- a/plugins/Db_autobackups/src/main.cpp +++ b/plugins/Db_autobackups/src/main.cpp @@ -42,7 +42,7 @@ static int FoldersGetBackupPath(WPARAM wParam, LPARAM lParam)  static void FoldersInit(void)
  {
 -	if (hFolder = FoldersRegisterCustomPathT("Database Backups", "Backup Folder", DIR SUB_DIR)) {
 +	if (hFolder = FoldersRegisterCustomPathT(LPGEN("Database Backups"), LPGEN("Backup Folder"), DIR SUB_DIR)) {
  		HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersGetBackupPath);
  		FoldersGetBackupPath(0, 0);
  	}
 diff --git a/plugins/FlashAvatars/src/cflash.cpp b/plugins/FlashAvatars/src/cflash.cpp index 6f7b25eec0..e4eb392101 100644 --- a/plugins/FlashAvatars/src/cflash.cpp +++ b/plugins/FlashAvatars/src/cflash.cpp @@ -603,7 +603,7 @@ static int systemModulesLoaded(WPARAM /*wParam*/, LPARAM /*lParam*/)  	// default for older Mirandas
  	else PathToAbsoluteT( _T("Flash\\"), path);
 -	hAvatarsFolder = FoldersRegisterCustomPathT("Avatars", "Flash Avatars", path);
 +	hAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("Flash Avatars"), path);
  	return 0;
  }
 diff --git a/plugins/MirOTR/MirOTR/src/options.cpp b/plugins/MirOTR/MirOTR/src/options.cpp index 75c63b92c8..98c7425504 100644 --- a/plugins/MirOTR/MirOTR/src/options.cpp +++ b/plugins/MirOTR/MirOTR/src/options.cpp @@ -40,7 +40,7 @@ int FoldersChanged(WPARAM wParam, LPARAM lParam)  void LoadFilenames()
  {
 -	if (hPATH_MIROTR = FoldersRegisterCustomPath(MODULENAME, "Private Data", DATA_DIRECTORY)) {
 +	if (hPATH_MIROTR = FoldersRegisterCustomPath(MODULENAME, LPGEN("Private Data"), DATA_DIRECTORY)) {
  		HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersChanged);
  		// get the path - above are only defaults - there may be a different value in the db
 diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp index d07448482b..682badbdda 100644 --- a/plugins/NewsAggregator/Src/Services.cpp +++ b/plugins/NewsAggregator/Src/Services.cpp @@ -51,7 +51,7 @@ int OnFoldersChanged(WPARAM, LPARAM)  int NewsAggrInit(WPARAM wParam, LPARAM lParam)
  {
 -	hNewsAggregatorFolder = FoldersRegisterCustomPathT("Avatars", "News Aggregator", MIRANDA_USERDATAT _T("\\Avatars\\")_T(DEFAULT_AVATARS_FOLDER));
 +	hNewsAggregatorFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("News Aggregator"), MIRANDA_USERDATAT _T("\\Avatars\\")_T(DEFAULT_AVATARS_FOLDER));
  	if (hNewsAggregatorFolder)
  		FoldersGetCustomPathT(hNewsAggregatorFolder, tszRoot, MAX_PATH, _T(""));
  	else
 diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index 1dde3c429f..24086278ab 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) int Load(void)  	TCHAR* tszFolder = Utils_ReplaceVarsT(_T("%miranda_userdata%\\"DEFAULT_UPDATES_FOLDER));
  	lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));
 -	hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Pack Updater", MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);
 +	hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Pack Updater"), MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);
  	if (hPackUpdaterFolder)
  		FoldersGetCustomPathT(hPackUpdaterFolder, tszRoot, MAX_PATH, _T(""));
 diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 59ec7969cc..610d87e284 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -85,7 +85,7 @@ extern "C" __declspec(dllexport) int Load(void)  {
  	mir_getLP(&pluginInfoEx);
  #endif
 -	hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Plugin Updater", MIRANDA_PATHT _T("\\")DEFAULT_UPDATES_FOLDER);
 +	hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Plugin Updater"), MIRANDA_PATHT _T("\\")DEFAULT_UPDATES_FOLDER);
  	if (hPluginUpdaterFolder)
  		OnFoldersChanged(0, 0);
  	else
 diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 7a3638ddf3..6e959b438b 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -292,7 +292,7 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam)  	HookEvent(ME_TTB_MODULELOADED, TTBLoaded);
  	//Folder plugin support
  	LPTSTR pszPath = mir_a2t(MIRANDA_PATH "\\Skins\\PopUp");
 -	folderId = FoldersRegisterCustomPathT(MODULNAME_LONG, "Skins", pszPath);
 +	folderId = FoldersRegisterCustomPathT(MODULNAME_LONG, LPGEN("Skins"), pszPath);
  	mir_free(pszPath);
  	//load skin
  	skins.load(_T("dir"));
 diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index 2c5aec0cb0..7ef088c832 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -160,7 +160,7 @@ int onModulesLoaded(WPARAM wParam, LPARAM lParam)      Sent_NetLog("onModuleLoaded begin");
  #endif
 -	 g_hFolders = FoldersRegisterCustomPathT(szModuleName, "Icons", _T(MIRANDA_PATH"\\icons"));
 +	 g_hFolders = FoldersRegisterCustomPathT(szModuleName, LPGEN("Icons"), _T(MIRANDA_PATH"\\icons"));
  	 InitIcons();
  	 GetFlags();
 diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 2a7c4912e1..362f698362 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -133,7 +133,7 @@ int hook_ModulesLoaded(WPARAM, LPARAM)  	}
  	// Folders plugin support
 -	hFolderScreenshot = FoldersRegisterCustomPathT("SendSS", "Screenshots",
 +	hFolderScreenshot = FoldersRegisterCustomPathT(LPGEN("SendSS"), LPGEN("Screenshots"),
  							_T(PROFILE_PATH)_T("\\")_T(CURRENT_PROFILE)_T("\\Screenshots"));
  	return 0;
 diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp index 4567422a9a..c0eed54ec6 100644 --- a/plugins/SmileyAdd/src/download.cpp +++ b/plugins/SmileyAdd/src/download.cpp @@ -224,7 +224,7 @@ int FolderChanged(WPARAM, LPARAM)  void GetSmileyCacheFolder(void)
  {
 -	hFolder = FoldersRegisterCustomPathT("SmileyAdd", "Smiley Cache", MIRANDA_USERDATAT _T("\\SmileyCache"));
 +	hFolder = FoldersRegisterCustomPathT(LPGEN("SmileyAdd"), LPGEN("Smiley Cache"), MIRANDA_USERDATAT _T("\\SmileyCache"));
  	if (hFolder) {
  		FoldersGetCustomPathT(hFolder, cachepath, MAX_PATH, _T(""));
  		HookEvent(ME_FOLDERS_PATH_CHANGED, FolderChanged);
 diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index e6797ef11d..f7c524af3a 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -128,7 +128,7 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)  		boost::thread *thr = new boost::thread(&CleanThread);
  	// Folders plugin support
 -	hStopSpamLogDirH = FoldersRegisterCustomPath("StopSpam", "StopSpam Logs", PROFILE_PATH "\\" CURRENT_PROFILE "\\StopSpamLog");
 +	hStopSpamLogDirH = FoldersRegisterCustomPath(LPGEN("StopSpam"), LPGEN("StopSpam Logs"), PROFILE_PATH "\\" CURRENT_PROFILE "\\StopSpamLog");
  	return 0;
  }
 diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index dbc529f4c5..f57c312a5a 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -314,10 +314,10 @@ int CMimAPI::FoldersPathChanged(WPARAM wParam, LPARAM lParam)  void CMimAPI::configureCustomFolders()
  {
 -	m_hDataPath = FoldersRegisterCustomPathT("TabSRMM", "Data path", const_cast<TCHAR *>(getDataPath()));
 -	m_hSkinsPath = FoldersRegisterCustomPathT("TabSRMM", "Skins root", const_cast<TCHAR *>(getSkinPath()));
 -	m_hAvatarsPath = FoldersRegisterCustomPathT("Avatars", "Saved TabSRMM avatars", const_cast<TCHAR *>(getSavedAvatarPath()));
 -	m_hChatLogsPath = FoldersRegisterCustomPathT("TabSRMM", "Group chat logs root", const_cast<TCHAR *>(getChatLogPath()));
 +	m_hDataPath = FoldersRegisterCustomPathT(LPGEN("TabSRMM"), LPGEN("Data path"), const_cast<TCHAR *>(getDataPath()));
 +	m_hSkinsPath = FoldersRegisterCustomPathT(LPGEN("TabSRMM"), LPGEN("Skins root"), const_cast<TCHAR *>(getSkinPath()));
 +	m_hAvatarsPath = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("Saved TabSRMM avatars"), const_cast<TCHAR *>(getSavedAvatarPath()));
 +	m_hChatLogsPath = FoldersRegisterCustomPathT(LPGEN("TabSRMM"), LPGEN("Group chat logs root"), const_cast<TCHAR *>(getChatLogPath()));
  	if (m_hDataPath)
  		HookEvent(ME_FOLDERS_PATH_CHANGED, CMimAPI::FoldersPathChanged);
 diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index bd583e1cfb..2a66af4804 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -260,7 +260,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)  	hFolderChanged = HookEvent(ME_FOLDERS_PATH_CHANGED, ReloadSkinFolder);
 -	hSkinFolder = FoldersRegisterCustomPathT(MODULE, "Tipper skins", MIRANDA_PATHT _T("\\") _T(DEFAULT_SKIN_FOLDER));
 +	hSkinFolder = FoldersRegisterCustomPathT(MODULE, LPGEN("Tipper skins"), MIRANDA_PATHT _T("\\") _T(DEFAULT_SKIN_FOLDER));
  	FoldersGetCustomPathT(hSkinFolder, SKIN_FOLDER, SIZEOF(SKIN_FOLDER), _T(DEFAULT_SKIN_FOLDER));
  	InitTipperSmileys();
 diff --git a/plugins/VersionInfo/src/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp index 717aa6dda9..2173fff405 100644 --- a/plugins/VersionInfo/src/hooked_events.cpp +++ b/plugins/VersionInfo/src/hooked_events.cpp @@ -36,7 +36,7 @@ int HookEvents()  int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
  {
 -	hOutputLocation = FoldersRegisterCustomPathT("VersionInfo", "Output folder", MIRANDA_PATHT);
 +	hOutputLocation = FoldersRegisterCustomPathT(LPGEN("VersionInfo"), LPGEN("Output folder"), MIRANDA_PATHT);
  	GetStringFromDatabase("UUIDCharMark", _T(DEF_UUID_CHARMARK), PLUGIN_UUID_MARK, cPLUGIN_UUID_MARK);
  	return 0;
 | 
