From b1224491a9de0ad3c35104507ee167f89d8fa76f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Jan 2014 09:32:03 +0000 Subject: =?UTF-8?q?=D0=A1++=20sources:=20=5F=5FVERSION=5FSTRING=20->=20=5F?= =?UTF-8?q?=5FVERSION=5FSTRING=5FDOTS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.miranda-ng.org/main/trunk@7881 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CmdLine/MimCmd/src/MimCmd.cpp | 2 +- plugins/CryptoPP/src/main.cpp | 2 +- plugins/SecureIM/src/commonheaders.cpp | 1 - plugins/SecureIM/src/commonheaders.h | 1 - plugins/SendScreenshotPlus/src/UAboutForm.cpp | 2 +- plugins/YAMN/src/proto/pop3/pop3comm.cpp | 2 +- protocols/FacebookRM/src/connection.cpp | 2 +- protocols/FacebookRM/src/main.cpp | 2 +- protocols/IRCG/src/input.cpp | 2 +- protocols/IcqOscarJ/src/UI/userinfotab.cpp | 2 +- protocols/JabberG/src/jabber_caps.cpp | 2 +- protocols/MSN/src/msn_misc.cpp | 2 +- protocols/Omegle/src/connection.cpp | 2 +- protocols/Omegle/src/main.cpp | 2 +- 14 files changed, 12 insertions(+), 14 deletions(-) diff --git a/plugins/CmdLine/MimCmd/src/MimCmd.cpp b/plugins/CmdLine/MimCmd/src/MimCmd.cpp index 2468f3f284..90a66d5c36 100644 --- a/plugins/CmdLine/MimCmd/src/MimCmd.cpp +++ b/plugins/CmdLine/MimCmd/src/MimCmd.cpp @@ -69,7 +69,7 @@ void ShowVersion() char name[128]; char message[1024]; GetProgramName(name, sizeof(name)); - mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __FILEVERSION_STRING); + mir_snprintf(message, sizeof(message), Translate("%s version %s"), name, __VERSION_STRING_DOTS); lpprintf("%s\n", message); } diff --git a/plugins/CryptoPP/src/main.cpp b/plugins/CryptoPP/src/main.cpp index ae447897f6..62f800df51 100644 --- a/plugins/CryptoPP/src/main.cpp +++ b/plugins/CryptoPP/src/main.cpp @@ -2,7 +2,7 @@ int hLangpack; LPCSTR szModuleName = MODULENAME; -LPCSTR szVersionStr = MODULENAME" DLL ("__VERSION_STRING")"; +LPCSTR szVersionStr = MODULENAME" DLL ("__VERSION_STRING_DOTS")"; HINSTANCE g_hInst; HANDLE hPGPPRIV = NULL; diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp index 97f2f5f13f..de3173403e 100644 --- a/plugins/SecureIM/src/commonheaders.cpp +++ b/plugins/SecureIM/src/commonheaders.cpp @@ -2,7 +2,6 @@ HINSTANCE g_hInst, g_hIconInst; -LPCSTR szVersionStr = MODULENAME" DLL ("__VERSION_STRING")"; char TEMP[MAX_PATH]; int TEMP_SIZE = 0; diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index 1485484f3d..9396b9426d 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -74,7 +74,6 @@ #define MODULENAME "SecureIM" -extern LPCSTR szVersionStr; extern char TEMP[MAX_PATH]; extern int TEMP_SIZE; diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp index ce7eaadf74..7fe37b58c5 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.cpp +++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp @@ -97,7 +97,7 @@ LRESULT TfrmAbout::wmInitdialog(WPARAM wParam, LPARAM lParam) { LPTSTR pszTitle = NULL; // Headerbar LPTSTR pszPlug = mir_a2t(__PLUGIN_NAME); - LPTSTR pszVer = mir_a2t(__VERSION_STRING); + LPTSTR pszVer = mir_a2t(__VERSION_STRING_DOTS); GetDlgItemText( m_hWnd, IDC_HEADERBAR, oldTitle, SIZEOF( oldTitle )); mir_sntprintf( newTitle, SIZEOF(newTitle), oldTitle, pszPlug, pszVer ); mir_freeAndNil(pszPlug); diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp index f20534aa75..16bbafd65a 100644 --- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp @@ -123,7 +123,7 @@ HYAMNPROTOPLUGIN POP3Plugin = NULL; YAMN_PROTOREGISTRATION POP3ProtocolRegistration = { "POP3 protocol (internal)", - __VERSION_STRING, + __VERSION_STRING_DOTS, __COPYRIGHT, __DESCRIPTION, __AUTHOREMAIL, diff --git a/protocols/FacebookRM/src/connection.cpp b/protocols/FacebookRM/src/connection.cpp index f88f3b2e90..2c9496add2 100644 --- a/protocols/FacebookRM/src/connection.cpp +++ b/protocols/FacebookRM/src/connection.cpp @@ -67,7 +67,7 @@ void FacebookProto::ChangeStatus(void*) { // Login SYSTEMTIME t; GetLocalTime(&t); - debugLogA("[%d.%d.%d] Using Facebook Protocol RM %s", t.wDay, t.wMonth, t.wYear, __VERSION_STRING); + debugLogA("[%d.%d.%d] Using Facebook Protocol RM %s", t.wDay, t.wMonth, t.wYear, __VERSION_STRING_DOTS); debugLogA("***** Beginning SignOn process"); diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index b480de9be6..ba2c9c0530 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -114,7 +114,7 @@ extern "C" int __declspec(dllexport) Load(void) #else agent << " Facebook Protocol RM/"; #endif - agent << __VERSION_STRING; + agent << __VERSION_STRING_DOTS; g_strUserAgent = agent.str(); return 0; diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index bfad4eedbc..f9fc281ba5 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -178,7 +178,7 @@ CMString CIrcProto::DoIdentifiers( CMString text, const TCHAR* ) CallService(MS_SYSTEM_GETVERSIONTEXT, SIZEOF(mirver), LPARAM(mirver)); ReplaceString(text, _T("%mirver"), _A2T(mirver)); - ReplaceString(text, _T("%version"), _T(__VERSION_STRING)); + ReplaceString(text, _T("%version"), _T(__VERSION_STRING_DOTS)); str[0] = 3; str[1] = '\0'; ReplaceString(text, _T("%color"), str); diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp index 8610e15f08..04c785fc87 100644 --- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp @@ -252,7 +252,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM char str[MAX_PATH]; WORD v[4]; CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)&v); - mir_snprintf(str, SIZEOF(str), "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING); + mir_snprintf(str, SIZEOF(str), "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING_DOTS); SetValue(ppro, hwndDlg, IDC_PORT, hContact, (char*)DBVT_WORD, (char*)ppro->wListenPort, SVS_ZEROISUNSPEC); SetValue(ppro, hwndDlg, IDC_VERSION, hContact, (char*)DBVT_WORD, (char*)ICQ_VERSION, SVS_ICQVERSION); diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index 7f455c9d28..2ad1ce9786 100644 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -691,7 +691,7 @@ BOOL CJabberClientCapsManager::HandleInfoRequest(HXML, CJabberIqInfo *pInfo, con form << XCHILD(_T("field")) << XATTR(_T("var"), _T("os_version")) << XCHILD(_T("value"), os); } form << XCHILD(_T("field")) << XATTR(_T("var"), _T("software")) << XCHILD(_T("value"), _T("Miranda NG Jabber Protocol")); - form << XCHILD(_T("field")) << XATTR(_T("var"), _T("software_version")) << XCHILD(_T("value"), _T(__VERSION_STRING)); + form << XCHILD(_T("field")) << XATTR(_T("var"), _T("software_version")) << XCHILD(_T("value"), _T(__VERSION_STRING_DOTS)); form << XCHILD(_T("field")) << XATTR(_T("var"), _T("x-miranda-core-version")) << XCHILD(_T("value"), szCoreVersion); } diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 44db330f64..0d568107f6 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -487,7 +487,7 @@ void ThreadData::sendCaps(void) mir_snprintf(capMsg, sizeof(capMsg), "Content-Type: text/x-clientcaps\r\n\r\n" "Client-Name: Miranda NG %s (MSN v.%s)\r\n", - mversion, __VERSION_STRING); + mversion, __VERSION_STRING_DOTS); sendMessage('U', NULL, 1, capMsg, MSG_DISABLE_HDR); } diff --git a/protocols/Omegle/src/connection.cpp b/protocols/Omegle/src/connection.cpp index 2e760b810e..46625c6eea 100644 --- a/protocols/Omegle/src/connection.cpp +++ b/protocols/Omegle/src/connection.cpp @@ -26,7 +26,7 @@ void OmegleProto::SignOn(void*) { SYSTEMTIME t; GetLocalTime( &t ); - debugLogA("[%d.%d.%d] Using Omegle Protocol %s", t.wDay, t.wMonth, t.wYear, __VERSION_STRING); + debugLogA("[%d.%d.%d] Using Omegle Protocol %s", t.wDay, t.wMonth, t.wYear, __VERSION_STRING_DOTS); ScopedLock s(signon_lock_); diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp index 6d07577936..c7c1438d16 100644 --- a/protocols/Omegle/src/main.cpp +++ b/protocols/Omegle/src/main.cpp @@ -120,7 +120,7 @@ extern "C" int __declspec(dllexport) Load(void) #else agent << " Omegle Protocol/"; #endif - agent << __VERSION_STRING; + agent << __VERSION_STRING_DOTS; g_strUserAgent = agent.str( ); } -- cgit v1.2.3