From 86e1ca2ee5833726d38628de1e91fa4953a55fa2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 1 May 2015 20:02:12 +0000
Subject: - token update; - version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@13348 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp |  2 +-
 protocols/WhatsApp/src/constants.h               | 13 ++-----------
 protocols/WhatsApp/src/main.cpp                  | 15 ++++++++-------
 protocols/WhatsApp/src/version.h                 |  2 +-
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp b/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp
index d2ff14411a..8a30ab9f2a 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WARegister.cpp
@@ -13,7 +13,7 @@ using namespace Utilities;
 /////////////////////////////////////////////////////////////////////////////////////////
 // Token generation
 
-static char WaToken[] = "PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk1418865329241";
+static char WaToken[] = "PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk1425519315543";
 
 std::string WAToken::GenerateToken(const string &number)
 {
diff --git a/protocols/WhatsApp/src/constants.h b/protocols/WhatsApp/src/constants.h
index ade54cd5e3..505e0e424e 100644
--- a/protocols/WhatsApp/src/constants.h
+++ b/protocols/WhatsApp/src/constants.h
@@ -2,15 +2,6 @@
 #define CONSTANTS_H
 
 // Version management
-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0, 0, 2, 0)
-#define __PRODUCT_DWORD             PLUGIN_MAKE_VERSION(0, 9, 14, 0)
-#define __VERSION_STRING            "0.0.2.0"
-#define __PRODUCT_STRING            "0.9.14.0"
-#define __VERSION_VS_FILE           0,0,2,
-#define __VERSION_VS_PROD           0,9,14,0
-#define __VERSION_VS_FILE_STRING    "0, 0, 2, 0"
-#define __VERSION_VS_PROD_STRING    "0, 9, 14, 0"
-
 #define PRODUCT_NAME _T("WhatsApp Protocol")
 
 // Limits
@@ -33,7 +24,7 @@
 
 // WhatsApp
 #define WHATSAPP_LOGIN_SERVER "c.whatsapp.net"
-#define ACCOUNT_USER_AGENT "WhatsApp/2.12.60 S40Version/14.26 Device/Nokia302"
+#define ACCOUNT_USER_AGENT "WhatsApp/2.12.68 S40Version/14.26 Device/Nokia302"
 #define ACCOUNT_URL_CODEREQUEST "https://r.whatsapp.net/v1/code.php"
 #define ACCOUNT_URL_CODEREQUESTV2 "https://v.whatsapp.net/v2/code"
 #define ACCOUNT_URL_REGISTERREQUEST "https://r.whatsapp.net/v1/register.php"
@@ -42,7 +33,7 @@
 #define ACCOUNT_URL_EXISTSV2 "https://v.whatsapp.net/v2/exist"
 
 // WhatsApp Nokia 302 S40
-#define ACCOUNT_RESOURCE  "S40-2.12.60"
+#define ACCOUNT_RESOURCE  "S40-2.12.68"
 
 #define WHATSAPP_RECV_MESSAGE 1
 #define WHATSAPP_SEND_MESSAGE 2
diff --git a/protocols/WhatsApp/src/main.cpp b/protocols/WhatsApp/src/main.cpp
index d4d607f452..99b3fb1811 100644
--- a/protocols/WhatsApp/src/main.cpp
+++ b/protocols/WhatsApp/src/main.cpp
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "version.h"
 
 CLIST_INTERFACE *pcli;
 int hLangpack;
@@ -7,13 +8,13 @@ HINSTANCE g_hInstance;
 
 PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
-	"WhatsApp Protocol",
-	__VERSION_DWORD,
-	"Provides basic support for WhatsApp.",
-	"Uli Hecht",
-	"uli.hecht@gmail.com",
-	"� 2013-14 Uli Hecht",
-	"http://example.com",
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
 	UNICODE_AWARE, //not transient
 	// {4f1ff7fa-4d75-44b9-93b0-2ced2e4f9e3e}
 	{ 0x4f1ff7fa, 0x4d75, 0x44b9, { 0x93, 0xb0, 0x2c, 0xed, 0x2e, 0x4f, 0x9e, 0x3e } }
diff --git a/protocols/WhatsApp/src/version.h b/protocols/WhatsApp/src/version.h
index 65de5db425..4f8b0884fc 100644
--- a/protocols/WhatsApp/src/version.h
+++ b/protocols/WhatsApp/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0
 #define __MINOR_VERSION          1
 #define __RELEASE_NUM            2
-#define __BUILD_NUM              13
+#define __BUILD_NUM              14
 
 #include <stdver.h>
 
-- 
cgit v1.2.3