Fix bugs of text encoding routines.

[ffftp/ffftp.git] / main.c

diff --git a/main.c b/main.c
index eaef74f..8aebef3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1308,7 +1308,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
                                                        break;\r
 \r
                                                case MENU_KNJ_SJIS :\r
-                                                       lpttt->lpszText = MSGJPN305;\r
+                                                       lpttt->lpszText = MSGJPN307;\r
                                                        break;\r
 \r
                                                case MENU_KNJ_EUC :\r
@@ -1320,7 +1320,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
                                                        break;\r
 \r
                                                case MENU_KNJ_UTF8N :\r
-                                                       lpttt->lpszText = MSGJPN306;\r
+                                                       lpttt->lpszText = MSGJPN308;\r
                                                        break;\r
 \r
                                                case MENU_KNJ_NONE :\r
@@ -1328,19 +1328,19 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
                                                        break;\r
 \r
                                                case MENU_L_KNJ_SJIS :\r
-                                                       lpttt->lpszText = MSGJPN307;\r
+                                                       lpttt->lpszText = MSGJPN309;\r
                                                        break;\r
 \r
                                                case MENU_L_KNJ_EUC :\r
-                                                       lpttt->lpszText = MSGJPN308;\r
+                                                       lpttt->lpszText = MSGJPN310;\r
                                                        break;\r
 \r
                                                case MENU_L_KNJ_JIS :\r
-                                                       lpttt->lpszText = MSGJPN309;\r
+                                                       lpttt->lpszText = MSGJPN311;\r
                                                        break;\r
 \r
                                                case MENU_L_KNJ_UTF8N :\r
-                                                       lpttt->lpszText = MSGJPN310;\r
+                                                       lpttt->lpszText = MSGJPN312;\r
                                                        break;\r
 \r
                                                case MENU_KANACNV :\r
@@ -1937,6 +1937,7 @@ void DoubleClickProc(int Win, int Mode, int App)
                                                        MainTransPkt.Type = AskTransferTypeAssoc(MainTransPkt.RemoteFile, AskTransferType());\r
                                                        MainTransPkt.Size = 1;\r
                                                        MainTransPkt.KanjiCode = AskHostKanjiCode();\r
+                                                       MainTransPkt.KanjiCodeDesired = AskLocalKanjiCode();\r
                                                        MainTransPkt.KanaCnv = AskHostKanaCnv();\r
                                                        MainTransPkt.Mode = EXIST_OVW;\r
                                                        MainTransPkt.ExistSize = 0;\r