X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=main.c;h=60628616768bd4db559e5fd3a71691f36e3475f7;hp=25ef052c7261b9d2ef368420dfc5f7b302a27d34;hb=8ef4e07fd1e721b0181b517444b4dffc859e9c09;hpb=b2bb9a2100f6e9f15626161761df0c094b975d19

diff --git a/main.c b/main.c
index 25ef052..6062861 100644
--- a/main.c
+++ b/main.c
@@ -231,6 +231,9 @@ int FolderAttrNum = 777;
 // 暗号化通信対応
 BYTE CertificateCacheHash[MAX_CERT_CACHE_HASH][20];
 BYTE SSLRootCAFileHash[20];
+// ファイルアイコン表示対応
+int DispFileIcon = NO;
+
 
 
 
@@ -336,6 +339,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 	LoadOpenSSL();
 #endif
 
+	// SFTP対応
+	LoadPuTTY();
+
 	Ret = FALSE;
 	hWndFtp = NULL;
 	hInstFtp = hInstance;
@@ -371,6 +377,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 #ifdef USE_OPENSSL
 	FreeOpenSSL();
 #endif
+	// SFTP対応
+	FreePuTTY();
 	OleUninitialize();
 	return(Ret);
 }
@@ -534,7 +542,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 					DispWindowTitle();
 					// SourceForge.JPによるフォーク
 //					SetTaskMsg("FFFTP Ver." VER_STR " Copyright(C) 1997-2010 Sota & cooperators.");
-					SetTaskMsg("FFFTP Ver." VER_STR " Copyright(C) 1997-2010 Sota & cooperators.\r\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192).");
+					SetTaskMsg("FFFTP Ver." VER_STR " Copyright(C) 1997-2010 Sota & cooperators.\r\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu).");
 
 					if(ForceIni)
 						SetTaskMsg("%s%s", MSGJPN283, IniPath);
@@ -1399,6 +1407,12 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 						LocalRbuttonMenu(1);
 					break;
 
+#if defined(HAVE_TANDEM)
+				case MENU_SWITCH_OSS :
+					SwitchOSSProc();
+					break;
+#endif
+
 				default :
 					if((LOWORD(wParam) >= MENU_BMARK_TOP) &&
 					   (LOWORD(wParam) < MENU_BMARK_TOP+100))
@@ -1441,7 +1455,15 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 						case MENU_DOWNLOAD :
 							lpttt->lpszText = MSGJPN157;
 							break;
+#if defined(HAVE_TANDEM)
+						case MENU_DOWNLOAD_AS :
+							lpttt->lpszText = MSGJPN065;
+							break;
 
+						case MENU_UPLOAD_AS :
+							lpttt->lpszText = MSGJPN064;
+							break;
+#endif
 						case MENU_UPLOAD :
 							lpttt->lpszText = MSGJPN158;
 							break;
@@ -3068,4 +3090,11 @@ BOOL IsMainThread()
 	if(GetCurrentThreadId() != MainThreadId)
 		return FALSE;
 	return TRUE;
-}
\ No newline at end of file
+}
+
+// ファイルアイコン表示対応
+int AskDispFileIcon(void)
+{
+	return(DispFileIcon);
+}
+