From dcce39da3e6f7485dca39950dfc835563de3c3ea Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Mon, 25 Feb 2013 10:15:31 +0000
Subject: 1 step: libcurl static link

git-svn-id: http://svn.miranda-ng.org/main/trunk@3763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/FTPFileYM/src/ftpfile.cpp | 45 +++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'plugins/FTPFileYM/src/ftpfile.cpp')

diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp
index 4b973ebfb4..557e13add8 100644
--- a/plugins/FTPFileYM/src/ftpfile.cpp
+++ b/plugins/FTPFileYM/src/ftpfile.cpp
@@ -31,7 +31,6 @@ extern Manager *manDlg;
 extern DeleteTimer &deleteTimer;
 extern ServerList &ftpList;
 extern Options &opt;
-extern LibCurl &curl; 
 
 BOOL (WINAPI *MyEnableThemeDialogTexture)(HANDLE, DWORD) = 0;
 int PrebuildContactMenu(WPARAM wParam, LPARAM lParam);
@@ -68,23 +67,23 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 }
 
 //------------ INIT FUNCTIONS ------------//
-
-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("Send file"),        "main",       IDI_MENU       },
-	{ LPGEN("Clipboard"),        "clipboard",  IDI_CLIPBOARD  },
-	{ LPGEN("Pause"),            "pause",      IDI_PAUSE      },
-	{ LPGEN("Resume"),           "resume",     IDI_RESUME     },
-	{ LPGEN("Delete from list"), "clear",      IDI_CLEAR      },
-	{ LPGEN("Delete from FTP"),  "delete",     IDI_DELETE     }
-};
-
-static void InitIcolib()
+
+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("Send file"),        "main",       IDI_MENU       },
+	{ LPGEN("Clipboard"),        "clipboard",  IDI_CLIPBOARD  },
+	{ LPGEN("Pause"),            "pause",      IDI_PAUSE      },
+	{ LPGEN("Resume"),           "resume",     IDI_RESUME     },
+	{ LPGEN("Delete from list"), "clear",      IDI_CLEAR      },
+	{ LPGEN("Delete from FTP"),  "delete",     IDI_DELETE     }
+};
+
+static void InitIcolib()
 {
 	Icon_Register(hInst, MODULE, iconList, SIZEOF(iconList), MODULE);
 }
@@ -462,7 +461,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	SkinAddNewSoundEx(SOUND_UPCOMPLETE, Translate("FTP File"), Translate("File upload complete"));
 	SkinAddNewSoundEx(SOUND_CANCEL, Translate("FTP File"), Translate("Upload canceled"));
 
-	curl.global_init(CURL_GLOBAL_ALL);
+	curl_global_init(CURL_GLOBAL_ALL);
 
 	return 0;
 }
@@ -478,11 +477,10 @@ int Shutdown(WPARAM wParam, LPARAM lParam)
 	DeleteJob::jobDone.release();
 	DBEntry::cleanupDB();
 
-	curl.global_cleanup();	
+	curl_global_cleanup();	
 
 	ftpList.deinit();
 	opt.deinit();
-	curl.deinit();
 
 	return 0;
 }
@@ -490,11 +488,6 @@ int Shutdown(WPARAM wParam, LPARAM lParam)
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfoEx);
-	if (!curl.init())
-	{
-		Utils::msgBox(TranslateT("FTP File YM won't be loaded because libcurl.dll is missing or wrong version!"), MB_OK | MB_ICONERROR);
-		return 1;
-	}
 
 #ifdef _DEBUG
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-- 
cgit v1.2.3