diff options
| author | George Hazan <ghazan@miranda.im> | 2020-10-12 19:32:45 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-10-12 19:32:45 +0300 |
| commit | c29e3d47e948f6375996c2d2aedda717906622a4 (patch) | |
| tree | bbbfebcfd0e222ece922d089b4656f59a175e577 /plugins/FTPFileYM/src | |
| parent | d4bcb42b2c6d0e7eeb9dd0845d36523de887f4d4 (diff) | |
fixes #2594 (FtpFile: problems with account names in options)
Diffstat (limited to 'plugins/FTPFileYM/src')
| -rw-r--r-- | plugins/FTPFileYM/src/ftpfile.cpp | 16 | ||||
| -rw-r--r-- | plugins/FTPFileYM/src/serverlist.cpp | 7 | ||||
| -rw-r--r-- | plugins/FTPFileYM/src/version.h | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 84c26bde71..05faa74ac4 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -51,11 +51,11 @@ CMPlugin::CMPlugin() : static IconItem iconList[] =
{
- { LPGEN("FTP Server 1"), "ftp1", IDI_FTP0 },
- { LPGEN("FTP Server 2"), "ftp2", IDI_FTP1 },
- { LPGEN("FTP Server 3"), "ftp3", IDI_FTP2 },
- { LPGEN("FTP Server 4"), "ftp4", IDI_FTP3 },
- { LPGEN("FTP Server 5"), "ftp5", IDI_FTP4 },
+ { LPGEN("FTP Server 1"), "ftp1", IDI_FTP0 },
+ { LPGEN("FTP Server 2"), "ftp2", IDI_FTP1 },
+ { LPGEN("FTP Server 3"), "ftp3", IDI_FTP2 },
+ { LPGEN("FTP Server 4"), "ftp4", IDI_FTP3 },
+ { LPGEN("FTP Server 5"), "ftp5", IDI_FTP4 },
{ LPGEN("Send file"), "main", IDI_MENU },
{ LPGEN("Clipboard"), "clipboard", IDI_CLIPBOARD },
{ LPGEN("Pause"), "pause", IDI_PAUSE },
@@ -76,7 +76,7 @@ void InitMenuItems() CMenuItem mi(&g_plugin);
SET_UID(mi, 0xB7132F5A, 0x65FC, 0x42C5, 0xB4, 0xCB, 0x54, 0xBC, 0xAC, 0x58, 0x34, 0xE9);
mi.flags = CMIF_UNICODE;
- mi.hIcolibItem = iconList[ServerList::FTP_COUNT].hIcolib;
+ mi.hIcolibItem = g_plugin.getIconHandle(IDI_MENU);
mi.position = 3000090001;
mi.name.w = LPGENW("FTP File");
@@ -140,7 +140,7 @@ void InitMenuItems() memset(&mi, 0, sizeof(mi));
SET_UID(mi, 0x0C17CAD7, 0x7F23, 0x449B, 0xB9, 0xCD, 0xFF, 0x50, 0xDA, 0x69, 0xF3, 0x6F);
mi.flags = CMIF_UNICODE;
- mi.hIcolibItem = iconList[ServerList::FTP_COUNT].hIcolib;
+ mi.hIcolibItem = g_plugin.getIconHandle(IDI_MENU);
mi.position = 3000090001;
mi.name.w = LPGENW("FTP File manager");
mi.pszService = MS_FTPFILE_SHOWMANAGER;
@@ -168,7 +168,7 @@ void InitTabsrmmButton() btn.dwButtonID = 1;
btn.pszModuleName = MODULENAME;
btn.dwDefPos = 105;
- btn.hIcon = iconList[ServerList::FTP_COUNT].hIcolib;
+ btn.hIcon = g_plugin.getIconHandle(IDI_MENU);
btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_CANBEHIDDEN;
btn.pwszTooltip = TranslateT("FTP File");
Srmm_AddButton(&btn, &g_plugin);
diff --git a/plugins/FTPFileYM/src/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp index eb1ad9c2cc..1255e74a6a 100644 --- a/plugins/FTPFileYM/src/serverlist.cpp +++ b/plugins/FTPFileYM/src/serverlist.cpp @@ -58,9 +58,12 @@ void ServerList::saveToDb() const ServerList::FTP::FTP(int index)
{
- ptrA Name(g_plugin.getStringA(CMStringA(FORMAT, "Name%d", index)));
- if (Name)
+ ptrW Name(g_plugin.getWStringA(CMStringA(FORMAT, "Name%d", index)));
+ if (Name == nullptr)
mir_snwprintf(m_stzName, TranslateT("FTP Server %d"), index + 1);
+ else
+ wcsncpy_s(m_stzName, Name, _TRUNCATE);
+
ptrA Pass(g_plugin.getStringA(CMStringA(FORMAT, "Password%d", index)));
if (Pass)
strncpy_s(m_szPass, Pass, _TRUNCATE);
diff --git a/plugins/FTPFileYM/src/version.h b/plugins/FTPFileYM/src/version.h index 9a2675aadf..cf9ae737b6 100644 --- a/plugins/FTPFileYM/src/version.h +++ b/plugins/FTPFileYM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 6
#define __RELEASE_NUM 0
-#define __BUILD_NUM 5
+#define __BUILD_NUM 6
#include <stdver.h>
|