From d6ed23e489d106cd4b06a03c820706467e853f49 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 25 Jan 2014 09:05:39 +0000
Subject: end of version zoo

git-svn-id: http://svn.miranda-ng.org/main/trunk@7880 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/src/UI/userinfotab.cpp | 12 ++++++------
 protocols/IcqOscarJ/src/version.h          |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'protocols/IcqOscarJ')

diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
index 979cb22714..8610e15f08 100644
--- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
@@ -1,22 +1,22 @@
 // ---------------------------------------------------------------------------80
 //                ICQ plugin for Miranda Instant Messenger
 //                ________________________________________
-// 
+//
 // Copyright � 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
 // Copyright � 2001-2002 Jon Keating, Richard Hughes
 // Copyright � 2002-2004 Martin �berg, Sam Kothari, Robert Rainwater
 // Copyright � 2004-2010 Joe Kucera
-// 
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // 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, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -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 %d.%d.%d.%d)", v[0], v[1], v[2], v[3], __FILEVERSION_STRING);
+						mir_snprintf(str, SIZEOF(str), "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING);
 
 						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);
@@ -277,7 +277,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		break;
 	}
 
-	return FALSE;  
+	return FALSE;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/IcqOscarJ/src/version.h b/protocols/IcqOscarJ/src/version.h
index f49017ee7f..7038a62cee 100644
--- a/protocols/IcqOscarJ/src/version.h
+++ b/protocols/IcqOscarJ/src/version.h
@@ -3,9 +3,7 @@
 #define __RELEASE_NUM            1
 #define __BUILD_NUM              0
 
-#define __FILEVERSION_STRING     __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __TOSTRING(x)            #x
-#define __VERSION_STRING         __TOSTRING(__FILEVERSION_STRING)
+#include <stdver.h>
 
 #define __PLUGIN_NAME            "IcqOscarJ Protocol"
 #define __DESCRIPTION            "ICQ protocol support for Miranda NG."
-- 
cgit v1.2.3