m_version.h => MS_SYSTEM_GETVERSION[TEXT]

git-svn-id: http://svn.miranda-ng.org/main/trunk@1337 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 22 insertions, 19 deletions

diff --git a/protocols/AimOscar/client.cpp b/protocols/AimOscar/client.cpp
index dc2155727e..5c4421ac11 100644
--- a/protocols/AimOscar/client.cpp
+++ b/protocols/AimOscar/client.cpp
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 #include "aim.h"

 #include "version.h"

-#include <m_version.h>

 

 int CAimProto::aim_send_connection_packet(HANDLE hServerConn,unsigned short &seqno,char *buf)

 {

@@ -53,8 +52,9 @@ int CAimProto::aim_auth_request(HANDLE hServerConn,unsigned short &seqno,const c
 	mir_md5_append(&state,(mir_md5_byte_t*)AIM_MD5_STRING, sizeof(AIM_MD5_STRING)-1);

 	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", MIRANDA_VERSION_STRING);

+	char client_id[64], mirver[64];

+	CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(mirver), (LPARAM)mirver);

+	int client_id_len = mir_snprintf(client_id, sizeof(client_id), "Miranda AIM, version %s", mirver);

 

 	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 0ab681b97b..a968c20bd5 100644
--- a/protocols/AimOscar/server.cpp
+++ b/protocols/AimOscar/server.cpp
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 #include "aim.h"

 #include "version.h"

-#include <m_version.h>

 

 void CAimProto::snac_md5_authkey(SNAC &snac,HANDLE hServerConn,unsigned short &seqno, const char* username, const char* password)//family 0x0017

 {

@@ -1069,7 +1068,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, MIRANDA_VERSION_DWORD);

+				setDword(AIM_KEY_LV, (DWORD)CallService(MS_SYSTEM_GETVERSION,0,0));

 			}

 

 			if (getByte(AIM_KEY_CM, 0))

diff --git a/protocols/Gadu-Gadu/gg.cpp b/protocols/Gadu-Gadu/gg.cpp
index 666adbe81d..3ac4c54871 100644
--- a/protocols/Gadu-Gadu/gg.cpp
+++ b/protocols/Gadu-Gadu/gg.cpp
@@ -21,14 +21,13 @@
 

 #include "gg.h"

 #include "version.h"

-#include <m_version.h>

 #include <errno.h>

 

 // Plugin info

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	"Gadu-Gadu Protocol",

-	MIRANDA_VERSION_DWORD,

+	__VERSION_DWORD,

 	"Provides support for Gadu-Gadu protocol",

 	"Bartosz Białek, Adam Strzelecki",

 	"dezred"/*antispam*/"@"/*antispam*/"gmail"/*antispam*/"."/*antispam*/"com",

diff --git a/protocols/IRCG/input.cpp b/protocols/IRCG/input.cpp
index 88c980149d..c564b7844c 100644
--- a/protocols/IRCG/input.cpp
+++ b/protocols/IRCG/input.cpp
@@ -162,7 +162,7 @@ CMString CIrcProto::DoAlias( const TCHAR *text, TCHAR *window)
 CMString CIrcProto::DoIdentifiers( CMString text, const TCHAR* )

 {

 	SYSTEMTIME time;

-	TCHAR str[100];

+	TCHAR str[2];

 

 	GetLocalTime( &time );

 	ReplaceString( text, _T("%mnick"), m_nick);

@@ -174,8 +174,9 @@ 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"), MIRANDA_VERSION_FILEVERSION);

-	ReplaceString(text, _T("%mirver"), str);

+	char mirver[100];

+	CallService(MS_SYSTEM_GETVERSIONTEXT, SIZEOF(mirver), LPARAM(mirver));

+	ReplaceString(text, _T("%mirver"), _A2T(mirver));

 

 	ReplaceString(text, _T("%version"), _T(__VERSION_STRING));

 

diff --git a/protocols/IRCG/irc.h b/protocols/IRCG/irc.h
index 34d639259b..9fe6584d87 100644
--- a/protocols/IRCG/irc.h
+++ b/protocols/IRCG/irc.h
@@ -73,7 +73,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_chat.h"

 #include "m_icolib.h"

 #include "m_ircscript.h"

-#include "m_version.h"

 #include "win2k.h"

 

 #include "resource.h"

diff --git a/protocols/IcqOscarJ/UI/userinfotab.cpp b/protocols/IcqOscarJ/UI/userinfotab.cpp
index 033fdd4a9a..91d28c0e04 100644
--- a/protocols/IcqOscarJ/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/UI/userinfotab.cpp
@@ -258,7 +258,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 						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);

-						SetValue(ppro, hwndDlg, IDC_MIRVER, hContact, (char*)DBVT_ASCIIZ, MirandaVersionToString(str, TRUE, ICQ_PLUG_VERSION, MIRANDA_VERSION_DWORD), SVS_ZEROISUNSPEC);

+						SetValue(ppro, hwndDlg, IDC_MIRVER, hContact, (char*)DBVT_ASCIIZ, MirandaVersionToString(str, TRUE, ICQ_PLUG_VERSION, CallService(MS_SYSTEM_GETVERSION,0,0)), SVS_ZEROISUNSPEC);

 						SetDlgItemTextUtf(hwndDlg, IDC_SUPTIME, ICQTranslateUtfStatic(LPGEN("Member since:"), str, MAX_PATH));

 						SetValue(ppro, hwndDlg, IDC_SYSTEMUPTIME, hContact, szProto, "MemberTS", SVS_TIMESTAMP);

 						SetValue(ppro, hwndDlg, IDC_STATUS, hContact, (char*)DBVT_WORD, (char*)ppro->m_iStatus, SVS_STATUSID);

diff --git a/protocols/IcqOscarJ/fam_01service.cpp b/protocols/IcqOscarJ/fam_01service.cpp
index 58860481ca..3b98079716 100755
--- a/protocols/IcqOscarJ/fam_01service.cpp
+++ b/protocols/IcqOscarJ/fam_01service.cpp
@@ -761,11 +761,14 @@ void CIcqProto::setUserInfo()
 	packDWord(&packet, 0x4D697261);   // Miranda Signature

 	packDWord(&packet, 0x6E64614E);

 

-	WORD ver[4] = { MIRANDA_VERSION_FILEVERSION };

-	packWord(&packet, ver[0]);

-	packWord(&packet, ver[1]);

-	packWord(&packet, ver[2]);

-	packWord(&packet, ver[3]);

+	int v[4];

+	char mirver[100];

+	CallService(MS_SYSTEM_GETVERSIONTEXT, SIZEOF(mirver), LPARAM(mirver));

+	sscanf(mirver, "%d.%d.%d.%d", &v[0], &v[1], &v[2], &v[3]);

+	packWord(&packet, v[0]);

+	packWord(&packet, v[1]);

+	packWord(&packet, v[2]);

+	packWord(&packet, v[3]);

 

 	//MIM/PackName

 	if ( bHasPackName ) {

diff --git a/protocols/IcqOscarJ/icqoscar.h b/protocols/IcqOscarJ/icqoscar.h
index 7000ac6b04..ef0e32a6fd 100755
--- a/protocols/IcqOscarJ/icqoscar.h
+++ b/protocols/IcqOscarJ/icqoscar.h
@@ -89,7 +89,6 @@
 #include <m_cluiframes.h>

 #include <m_ignore.h>

 #include <m_avatars.h>

-#include <m_version.h>

 #include <win2k.h>

 

 // Project resources

diff --git a/protocols/JabberG/docs/changelog_jabber.txt b/protocols/JabberG/docs/changelog_jabber.txt
index fcde5a6c8e..1d41cc12a6 100644
--- a/protocols/JabberG/docs/changelog_jabber.txt
+++ b/protocols/JabberG/docs/changelog_jabber.txt
@@ -4,6 +4,10 @@ Legend:
 [-] deleted

 [!] bug fixed

 

+Version 0.11.0.1

+===============

+Jabber development was resumed after years of silence and small bugfixes

+

 Version 0.7.0.7

 ===============

 [+] XEP-0115 support (Entity Capabilities)

diff --git a/protocols/JabberG/jabber_caps.cpp b/protocols/JabberG/jabber_caps.cpp
index f38884dda3..884dcfa24b 100644
--- a/protocols/JabberG/jabber_caps.cpp
+++ b/protocols/JabberG/jabber_caps.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "version.h"

-#include <m_version.h>

 

 const JabberFeatCapPair g_JabberFeatCapPairs[] = {

 	{	_T(JABBER_FEAT_DISCO_INFO),           JABBER_CAPS_DISCO_INFO,           _T("Supports Service Discovery info"), },