From 158516fc55b5e38fd3d5cd67150cc85a5162f76b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 3 Aug 2012 12:23:43 +0000 Subject: all protos got their own versions, but they still pass the core version to the outside world git-svn-id: http://svn.miranda-ng.org/main/trunk@1335 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/client.cpp | 3 ++- protocols/AimOscar/server.cpp | 3 ++- protocols/AimOscar/version.h | 7 +++---- protocols/Gadu-Gadu/gg.cpp | 3 ++- protocols/Gadu-Gadu/version.h | 6 +++--- protocols/IRCG/version.h | 6 +++--- protocols/IcqOscarJ/version.h | 6 +++--- protocols/JabberG/jabber_caps.cpp | 3 ++- protocols/JabberG/version.h | 7 +++---- protocols/MSN/version.h | 7 +++---- protocols/Yahoo/version.h | 7 +++---- 11 files changed, 29 insertions(+), 29 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/client.cpp b/protocols/AimOscar/client.cpp index 2e0e5c94bf..dc2155727e 100644 --- a/protocols/AimOscar/client.cpp +++ b/protocols/AimOscar/client.cpp @@ -18,6 +18,7 @@ along with this program. If not, see . */ #include "aim.h" #include "version.h" +#include int CAimProto::aim_send_connection_packet(HANDLE hServerConn,unsigned short &seqno,char *buf) { @@ -53,7 +54,7 @@ int CAimProto::aim_auth_request(HANDLE hServerConn,unsigned short &seqno,const c mir_md5_finish(&state,auth_hash); char client_id[64]; - int client_id_len = mir_snprintf(client_id, sizeof(client_id), "Miranda AIM, version %s", __VERSION_STRING); + int client_id_len = mir_snprintf(client_id, sizeof(client_id), "Miranda AIM, version %s", MIRANDA_VERSION_STRING); char* buf=(char*)alloca(SNAC_SIZE+TLV_HEADER_SIZE*14+MD5_HASH_LENGTH+strlen(username)+client_id_len+30+strlen(language)+strlen(country)); diff --git a/protocols/AimOscar/server.cpp b/protocols/AimOscar/server.cpp index 800f90a882..0ab681b97b 100644 --- a/protocols/AimOscar/server.cpp +++ b/protocols/AimOscar/server.cpp @@ -18,6 +18,7 @@ along with this program. If not, see . */ #include "aim.h" #include "version.h" +#include void CAimProto::snac_md5_authkey(SNAC &snac,HANDLE hServerConn,unsigned short &seqno, const char* username, const char* password)//family 0x0017 { @@ -1068,7 +1069,7 @@ void CAimProto::snac_contact_list(SNAC &snac,HANDLE hServerConn,unsigned short & if (getDword(AIM_KEY_LV, 0) < 0x80500) { upload_nicks(); - setDword(AIM_KEY_LV, __VERSION_DWORD); + setDword(AIM_KEY_LV, MIRANDA_VERSION_DWORD); } if (getByte(AIM_KEY_CM, 0)) diff --git a/protocols/AimOscar/version.h b/protocols/AimOscar/version.h index b85995d3a5..cd1ad86ac6 100644 --- a/protocols/AimOscar/version.h +++ b/protocols/AimOscar/version.h @@ -15,7 +15,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) - +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0,11,0,1) diff --git a/protocols/Gadu-Gadu/gg.cpp b/protocols/Gadu-Gadu/gg.cpp index 3ac4c54871..666adbe81d 100644 --- a/protocols/Gadu-Gadu/gg.cpp +++ b/protocols/Gadu-Gadu/gg.cpp @@ -21,13 +21,14 @@ #include "gg.h" #include "version.h" +#include #include // Plugin info PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), "Gadu-Gadu Protocol", - __VERSION_DWORD, + MIRANDA_VERSION_DWORD, "Provides support for Gadu-Gadu protocol", "Bartosz Białek, Adam Strzelecki", "dezred"/*antispam*/"@"/*antispam*/"gmail"/*antispam*/"."/*antispam*/"com", diff --git a/protocols/Gadu-Gadu/version.h b/protocols/Gadu-Gadu/version.h index aed5ea4c20..ce9e719bd6 100644 --- a/protocols/Gadu-Gadu/version.h +++ b/protocols/Gadu-Gadu/version.h @@ -18,6 +18,6 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //////////////////////////////////////////////////////////////////////////////// -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1) diff --git a/protocols/IRCG/version.h b/protocols/IRCG/version.h index 18333d3187..883b985346 100644 --- a/protocols/IRCG/version.h +++ b/protocols/IRCG/version.h @@ -1,6 +1,6 @@ -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1) #define __DESC "IRC protocol for Miranda IM" #define __AUTHOR "Miranda team" diff --git a/protocols/IcqOscarJ/version.h b/protocols/IcqOscarJ/version.h index 8edfeaebb9..0231d7a7ea 100644 --- a/protocols/IcqOscarJ/version.h +++ b/protocols/IcqOscarJ/version.h @@ -1,3 +1,3 @@ -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1) diff --git a/protocols/JabberG/jabber_caps.cpp b/protocols/JabberG/jabber_caps.cpp index 9656264071..176fd135ac 100644 --- a/protocols/JabberG/jabber_caps.cpp +++ b/protocols/JabberG/jabber_caps.cpp @@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "jabber_iq.h" #include "jabber_caps.h" #include "version.h" +#include const JabberFeatCapPair g_JabberFeatCapPairs[] = { { _T(JABBER_FEAT_DISCO_INFO), JABBER_CAPS_DISCO_INFO, _T("Supports Service Discovery info"), }, @@ -694,7 +695,7 @@ BOOL CJabberClientCapsManager::HandleInfoRequest( HXML, CJabberIqInfo* pInfo, co 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(MIRANDA_VERSION_STRING)); form << XCHILD( _T("field")) << XATTR( _T("var"), _T("x-miranda-core-version")) << XCHILD( _T("value"), szCoreVersion ); #ifdef _DEBUG diff --git a/protocols/JabberG/version.h b/protocols/JabberG/version.h index fead11179a..cf7a422dc2 100644 --- a/protocols/JabberG/version.h +++ b/protocols/JabberG/version.h @@ -1,4 +1,3 @@ -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) - +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0,11,0,1) diff --git a/protocols/MSN/version.h b/protocols/MSN/version.h index 77a5971068..cb78075b09 100644 --- a/protocols/MSN/version.h +++ b/protocols/MSN/version.h @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) - +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1) diff --git a/protocols/Yahoo/version.h b/protocols/Yahoo/version.h index c431ab4a7e..0231d7a7ea 100644 --- a/protocols/Yahoo/version.h +++ b/protocols/Yahoo/version.h @@ -1,4 +1,3 @@ -#define __FILEVERSION_STRING 0,92,2,0 -#define __VERSION_STRING "0.92.2.0" -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 92, 2, 0) - +#define __FILEVERSION_STRING 0,11,0,1 +#define __VERSION_STRING "0.11.0.1" +#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1) -- cgit v1.2.3