summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/ExternalAPI/m_langman.h15
-rw-r--r--plugins/LangMan/src/main.cpp28
-rw-r--r--plugins/LangMan/src/version.h12
3 files changed, 9 insertions, 46 deletions
diff --git a/plugins/ExternalAPI/m_langman.h b/plugins/ExternalAPI/m_langman.h
index 3165e04c6b..746244a42c 100644
--- a/plugins/ExternalAPI/m_langman.h
+++ b/plugins/ExternalAPI/m_langman.h
@@ -23,21 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef M_LANGMAN_H__
#define M_LANGMAN_H__
-#if defined (_MSC_VER) && (_MSC_VER >= 1020)
- #pragma once
-#endif
-
-/*
- Language Pack Manager v1.0.2.2
- If you have any question or extension whishes please let me know:
- hrathh at users.sourceforge.net
-*/
-
-/* interface id */
-#if !defined(MIID_LANGMAN)
- #define MIID_LANGMAN {0xd80370d5,0x4b1e,0x46a8,{0xac,0xa4,0x1f,0xaa,0xd7,0x9b,0x7d,0x1e}}
-#endif
-
/* Show the download language dialog. v1.0.2.0+
wParam=lParam=0
The dialog can't have a parent due to it's asynchronous nature.
diff --git a/plugins/LangMan/src/main.cpp b/plugins/LangMan/src/main.cpp
index c5b267fd33..3493431e9c 100644
--- a/plugins/LangMan/src/main.cpp
+++ b/plugins/LangMan/src/main.cpp
@@ -31,11 +31,11 @@ static PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
"Language Pack Manager",
PLUGIN_VERSION,
- "Helps you manage Language Packs of different languages.", /* autotranslated */
+ "Helps you manage Language Packs of different languages.",
"H. Herkenrath",
"hrathh@users.sourceforge.net",
"© 2005-2007 H. Herkenrath",
- PLUGIN_WEBSITE,
+ "http://miranda-ng.org/",
UNICODE_AWARE,
// {D4BDD1EB-56F1-4a87-A187-67246EE919A2}
{0xd4bdd1eb, 0x56f1, 0x4a87, {0xa1, 0x87, 0x67, 0x24, 0x6e, 0xe9, 0x19, 0xa2}},
@@ -45,9 +45,7 @@ static PLUGININFOEX pluginInfo = {
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, void*)
{
- if (fdwReason == DLL_PROCESS_ATTACH)
- hInst = hinstDLL;
-
+ hInst = hinstDLL;
return TRUE;
}
@@ -82,23 +80,15 @@ static void InstallFile(const TCHAR *pszFileName, const TCHAR *pszDestSubDir)
}
}
-#ifdef __cplusplus
-extern "C" {
-#endif
-
///////////////////////////////////////////////////////////////////////////////
-__declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
}
///////////////////////////////////////////////////////////////////////////////
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_LANGMAN, MIID_LAST};
-
-///////////////////////////////////////////////////////////////////////////////
-
static int LangManModulesLoaded(WPARAM, LPARAM)
{
if ( ServiceExists("DBEditorpp/RegisterSingleModule"))
@@ -106,7 +96,7 @@ static int LangManModulesLoaded(WPARAM, LPARAM)
return 0;
}
-__declspec(dllexport) int Load(void)
+extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP( &pluginInfo );
@@ -141,13 +131,9 @@ __declspec(dllexport) int Load(void)
///////////////////////////////////////////////////////////////////////////////
-__declspec(dllexport) int Unload(void)
+extern "C" __declspec(dllexport) int Unload(void)
{
UninitOptions();
UnhookEvent(hHookModulesLoaded);
return 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
+} \ No newline at end of file
diff --git a/plugins/LangMan/src/version.h b/plugins/LangMan/src/version.h
index 9988cba835..2796f223f8 100644
--- a/plugins/LangMan/src/version.h
+++ b/plugins/LangMan/src/version.h
@@ -19,17 +19,9 @@ along with this program (LangMan-License.txt); if not, write to the Free Softwar
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define NEEDED_MIRANDA_VERSION PLUGIN_MAKE_VERSION(0, 6, 0, 0)
-#define NEEDED_MIRANDA_VERSION_STR "0.6"
#define PLUGIN_VERSION PLUGIN_MAKE_VERSION(1, 0, 2, 3)
#define FILE_VERSION 1, 0, 2, 3
-#if defined(_DEBUG)
- #define FILE_VERSION_STR "1.0.2.3 alpha"
- #define USERAGENT_VERSION "1.0.2.3 (alpha)"
-#else
- #define FILE_VERSION_STR "1.0.2.3"
- #define USERAGENT_VERSION "1.0.2.3"
-#endif
+#define FILE_VERSION_STR "1.0.2.3"
+#define USERAGENT_VERSION "1.0.2.3"
- #define PLUGIN_WEBSITE "http://miranda-ng.org/"