From 57eda120c8c612d0a7785d8ba65de7924b7b867f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 5 Jun 2012 19:35:11 +0000 Subject: mirVersion cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/input.cpp | 2 +- protocols/IRCG/irc.h | 1 - protocols/IRCG/main.cpp | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) (limited to 'protocols') diff --git a/protocols/IRCG/input.cpp b/protocols/IRCG/input.cpp index a6724359e0..bdcedaae82 100644 --- a/protocols/IRCG/input.cpp +++ b/protocols/IRCG/input.cpp @@ -174,7 +174,7 @@ CMString CIrcProto::DoIdentifiers( CMString text, const TCHAR* ) ReplaceString( text, _T("%network"), m_info.sNetwork.c_str()); ReplaceString( text, _T("%me"), m_info.sNick.c_str()); - mir_sntprintf( str, SIZEOF(str), _T("%d.%d.%d.%d"),(mirVersion>>24)&0xFF,(mirVersion>>16)&0xFF,(mirVersion>>8)&0xFF,mirVersion&0xFF); + mir_sntprintf( str, SIZEOF(str), _T("%d.%d.%d.%d"), MIRANDA_VERSION_FILEVERSION); ReplaceString(text, _T("%mirver"), str); ReplaceString(text, _T("%version"), _T(__VERSION_STRING)); diff --git a/protocols/IRCG/irc.h b/protocols/IRCG/irc.h index 1d69f1cd85..13ec720381 100644 --- a/protocols/IRCG/irc.h +++ b/protocols/IRCG/irc.h @@ -687,7 +687,6 @@ extern HINSTANCE hInst; extern LIST g_Instances; -extern int mirVersion; extern OBJLIST g_servers; void UpgradeCheck(void); diff --git a/protocols/IRCG/main.cpp b/protocols/IRCG/main.cpp index 841817a07e..ab48fd4f1b 100644 --- a/protocols/IRCG/main.cpp +++ b/protocols/IRCG/main.cpp @@ -28,7 +28,6 @@ UTF8_INTERFACE utfi; MM_INTERFACE mmi; LIST_INTERFACE li; -int mirVersion; int hLangpack; static int CompareServers( const SERVER_INFO* p1, const SERVER_INFO* p2 ) @@ -76,14 +75,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if ( mirandaVersion < MIRANDA_VERSION_CORE ) { - MessageBoxA( NULL, - "The IRC protocol plugin cannot be loaded. It requires Miranda IM " MIRANDA_VERSION_CORE_STRING " or later.", - "IRC Protocol Plugin", MB_OK|MB_ICONWARNING|MB_SETFOREGROUND|MB_TOPMOST ); - return NULL; - } - - mirVersion = mirandaVersion; return &pluginInfo; } -- cgit v1.2.3