no more google related code in Jabber

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

18 files changed, 191 insertions, 220 deletions

diff --git a/protocols/GTalkExt/GTalkExt_10.vcxproj b/protocols/GTalkExt/GTalkExt_10.vcxproj
index f3f2c59744..9aecc88c0a 100644
--- a/protocols/GTalkExt/GTalkExt_10.vcxproj
+++ b/protocols/GTalkExt/GTalkExt_10.vcxproj
@@ -189,6 +189,7 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\db.h" />

+    <ClInclude Include="src\googletalk.h" />

     <ClInclude Include="src\handlers.h" />

     <ClInclude Include="src\inbox.h" />

     <ClInclude Include="src\notifications.h" />

diff --git a/protocols/GTalkExt/GTalkExt_10.vcxproj.filters b/protocols/GTalkExt/GTalkExt_10.vcxproj.filters
index bdf14c857d..0795b16915 100644
--- a/protocols/GTalkExt/GTalkExt_10.vcxproj.filters
+++ b/protocols/GTalkExt/GTalkExt_10.vcxproj.filters
@@ -74,6 +74,9 @@
     <ClInclude Include="src\targetver.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\googletalk.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\settings.rc">

diff --git a/protocols/GTalkExt/GTalkExt_11.vcxproj b/protocols/GTalkExt/GTalkExt_11.vcxproj
index cafd1847f0..40958a0a55 100644
--- a/protocols/GTalkExt/GTalkExt_11.vcxproj
+++ b/protocols/GTalkExt/GTalkExt_11.vcxproj
@@ -192,6 +192,7 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\db.h" />

+    <ClInclude Include="src\googletalk.h" />

     <ClInclude Include="src\handlers.h" />

     <ClInclude Include="src\inbox.h" />

     <ClInclude Include="src\notifications.h" />

diff --git a/protocols/GTalkExt/GTalkExt_11.vcxproj.filters b/protocols/GTalkExt/GTalkExt_11.vcxproj.filters
index d0d73546b0..f34094e47a 100644
--- a/protocols/GTalkExt/GTalkExt_11.vcxproj.filters
+++ b/protocols/GTalkExt/GTalkExt_11.vcxproj.filters
@@ -74,6 +74,9 @@
     <ClInclude Include="src\targetver.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\googletalk.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\settings.rc">

diff --git a/protocols/GTalkExt/src/GTalkExt.cpp b/protocols/GTalkExt/src/GTalkExt.cpp
index e03bd6a2dd..b0ca3cf84b 100644
--- a/protocols/GTalkExt/src/GTalkExt.cpp
+++ b/protocols/GTalkExt/src/GTalkExt.cpp
@@ -31,7 +31,7 @@
 int   hLangpack;

 HICON g_hPopupIcon = 0;

 

-LIST<IJabberInterface> g_accs(1, PtrKeySortT);

+LIST<GoogleTalkAcc> g_accs(1, PtrKeySortT);

 

 PLUGININFOEX pluginInfo =

 {

diff --git a/protocols/GTalkExt/src/Version.h b/protocols/GTalkExt/src/Version.h
index bed7bb9a3f..0e7b6cc41e 100644
--- a/protocols/GTalkExt/src/Version.h
+++ b/protocols/GTalkExt/src/Version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				1

 #define __RELEASE_NUM				0

-#define __BUILD_NUM					1

+#define __BUILD_NUM					2

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 

diff --git a/protocols/GTalkExt/src/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp
index d7d786f325..f7e34e1489 100644
--- a/protocols/GTalkExt/src/handlers.cpp
+++ b/protocols/GTalkExt/src/handlers.cpp
@@ -26,61 +26,22 @@
 #include "notifications.h"

 #include "options.h"

 

-#define JABBER_EXT_GTALK_PMUC _T("pmuc-v1")

-

 #define JABBER_IQID  _T("mir_")

 #define JABBER_IQID_FORMAT  _T("mir_%d")

 

-#define NOTIFY_FEATURE_XMLNS  _T("google:mail:notify")

-#define SETTING_FEATURE_XMLNS  _T("google:setting")

-#define DISCOVERY_XMLNS  _T("http://jabber.org/protocol/disco#info")

-

-#define MESSAGE_URL_FORMAT_STANDARD _T("%s/#inbox/%x%08x")

-#define MESSAGE_URL_FORMAT_HTML  _T("%s/h/?v=c&th=%x%08x")

-

-#define ATTRNAME_TYPE              _T("type")

-#define ATTRNAME_FROM              _T("from")

-#define ATTRNAME_TO                _T("to")

-#define ATTRNAME_URL               _T("url")

-#define ATTRNAME_TID               _T("tid")

-#define ATTRNAME_UNREAD            _T("unread")

-#define ATTRNAME_XMLNS             _T("xmlns")

-#define ATTRNAME_ID                _T("id")

-#define ATTRNAME_TOTAL_MATCHED     _T("total-matched")

-#define ATTRNAME_NAME              _T("name")

-#define ATTRNAME_ADDRESS           _T("address")

-#define ATTRNAME_RESULT_TIME       _T("result-time")

-#define ATTRNAME_NEWER_THAN_TIME   _T("newer-than-time")

-#define ATTRNAME_NEWER_THAN_TID    _T("newer-than-tid")

-#define ATTRNAME_VALUE             _T("value")

-#define ATTRNAME_VAR               _T("var")

-										     

-#define IQTYPE_RESULT              _T("result")

-#define IQTYPE_SET                 _T("set")

-#define IQTYPE_GET                 _T("get")

-

-#define NODENAME_MAILBOX           _T("mailbox")

-#define NODENAME_QUERY             _T("query")

-#define NODENAME_IQ                _T("iq")

-#define NODENAME_USERSETTING       _T("usersetting")

-#define NODENAME_MAILNOTIFICATIONS _T("mailnotifications")

-#define NODENAME_SUBJECT           _T("subject")

-#define NODENAME_SNIPPET           _T("snippet")

-#define NODENAME_SENDERS           _T("senders")

-#define NODENAME_FEATURE           _T("feature")

-#define NODENAME_NEW_MAIL          _T("new-mail")

-

-#define SETTING_TRUE               _T("true")

-

-#define RESPONSE_TIMEOUT (1000 * 60 * 60)

-#define TIMER_INTERVAL   (1000 * 60 * 2)

-

 LRESULT CALLBACK PopupProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

 XML_API xi = {0};

 

 #include <tchar.h>

 

+GoogleTalkAcc* isGoogle(LPARAM lParam)

+{

+	return g_accs.find((GoogleTalkAcc*)&lParam);

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

 void FormatMessageUrl(LPCTSTR format, LPTSTR buf, LPCTSTR mailbox, LPCTSTR tid)

 {

 	ULARGE_INTEGER iTid; iTid.QuadPart = _tstoi64(tid);

@@ -328,33 +289,139 @@ extern DWORD itlsRecursion;
 

 BOOL SendHandler(IJabberInterface *ji, HXML node, void *pUserData)

 {

-	HXML queryNode = xi.getChildByAttrValue(node, NODENAME_QUERY, ATTRNAME_XMLNS, DISCOVERY_XMLNS);

-	if (!queryNode)

+	GoogleTalkAcc *gta = isGoogle(LPARAM(ji));

+	if (gta == NULL)

 		return FALSE;

-	if ( lstrcmp(xi.getName(node), NODENAME_IQ) || lstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_GET))

+

+	HXML queryNode = xi.getChildByAttrValue(node, NODENAME_QUERY, ATTRNAME_XMLNS, DISCOVERY_XMLNS);

+	if (queryNode) {

+		if ( lstrcmp(xi.getName(node), NODENAME_IQ) || lstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_GET))

+			return FALSE;

+		if (TlsGetValue(itlsRecursion))

+			return FALSE;

+

+		TlsSetValue(itlsRecursion, (PVOID)TRUE);

+

+		UINT id = ji->SerialNext();

+		HXML newNode = xi.createNode(NODENAME_IQ, NULL, FALSE);

+		xi.addAttr(newNode, ATTRNAME_TYPE, IQTYPE_GET);

+		xi.addAttr(newNode, ATTRNAME_TO, xi.getAttrValue(node, ATTRNAME_TO));

+		xi.addAttrInt(newNode, ATTRNAME_ID, id);

+		xi.addAttr(xi.addChild(newNode, NODENAME_QUERY, NULL), ATTRNAME_XMLNS, DISCOVERY_XMLNS);

+		ji->SendXmlNode(newNode);

+		xi.destroyNode(newNode);

+

+		ji->AddTemporaryIqHandler(DiscoverHandler, JABBER_IQ_TYPE_RESULT, id, NULL, RESPONSE_TIMEOUT);

+		TlsSetValue(itlsRecursion, (PVOID)FALSE);

+	}

+

+	if ( !lstrcmp(xi.getName(node), _T("presence")) && xi.getAttrValue(node, ATTRNAME_TO) == 0) {

+		if (!gta->m_bGoogleSharedStatus)

+			return FALSE;

+

+		HXML statNode = xi.getChildByPath(node, _T("status"), 0);

+		HXML showNode = xi.getChildByPath(node, _T("show"), 0);

+		if (statNode) {

+			LPCTSTR status = xi.getText(showNode);

+			LPCTSTR msg = xi.getText(statNode);

+			gta->SendIqGoogleSharedStatus(status, msg);

+		}

+	}

+

+	return FALSE;

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// Google shared status

+

+BOOL OnIqResultGoogleSharedStatus(IJabberInterface *ji, HXML node, void *pUserData)

+{

+	GoogleTalkAcc *gta = isGoogle(LPARAM(ji));

+	if (gta != NULL) {

+		gta->m_bGoogleSharedStatus = lstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_RESULT) == 0;

+		gta->m_bGoogleSharedStatusLock = FALSE;

+	}

+	return FALSE;

+}

+

+BOOL OnIqSetGoogleSharedStatus(IJabberInterface *ji, HXML iqNode, void *pUserData)

+{

+	GoogleTalkAcc *gta = isGoogle(LPARAM(ji));

+	if (gta == NULL)

 		return FALSE;

-	if (TlsGetValue(itlsRecursion))

+	if (lstrcmp(xi.getAttrValue(iqNode, ATTRNAME_TYPE), IQTYPE_SET))

 		return FALSE;

+	if (gta->m_bGoogleSharedStatusLock)

+		return TRUE;

 

-	TlsSetValue(itlsRecursion, (PVOID)TRUE);

+	int status;

+	HXML query = xi.getChildByPath(iqNode, NODENAME_QUERY, 0);

+	HXML node = xi.getChildByPath(query, _T("invisible"), 0);

+	if (0 == _tcsicmp(_T("true"), xi.getAttrValue(node, _T("value"))))

+		status = ID_STATUS_INVISIBLE;

+	else {

+		LPCTSTR txt = xi.getText( xi.getChildByPath(query, _T("show"), 0));

+		if (txt && 0 == _tcsicmp(_T("dnd"), txt))

+			status = ID_STATUS_DND;

+		else if (gta->m_pa->ppro->m_iStatus == ID_STATUS_DND || gta->m_pa->ppro->m_iStatus == ID_STATUS_INVISIBLE)

+			status = ID_STATUS_ONLINE;

+		else

+			status = gta->m_pa->ppro->m_iStatus;

+	}

 

-	UINT id = ji->SerialNext();

-	HXML newNode = xi.createNode(NODENAME_IQ, NULL, FALSE);

-	xi.addAttr(newNode, ATTRNAME_TYPE, IQTYPE_GET);

-	xi.addAttr(newNode, ATTRNAME_TO, xi.getAttrValue(node, ATTRNAME_TO));

+	if (status != gta->m_pa->ppro->m_iStatus)

+		CallProtoService(gta->m_pa->szModuleName, PS_SETSTATUS, status, 0);

 

-	TCHAR idAttr[30];

-	mir_sntprintf(idAttr, SIZEOF(idAttr), JABBER_IQID_FORMAT, id);

-	xi.addAttr(newNode, ATTRNAME_ID, idAttr);

+	return TRUE;

+}

 

-	xi.addAttr(xi.addChild(newNode, NODENAME_QUERY, NULL), ATTRNAME_XMLNS, DISCOVERY_XMLNS);

-	ji->SendXmlNode(newNode);

+void GoogleTalkAcc::SendIqGoogleSharedStatus(LPCTSTR status, LPCTSTR msg)

+{

+	HXML iq = xi.createNode(NODENAME_IQ, NULL, FALSE);

+	xi.addAttr(iq, ATTRNAME_TYPE, IQTYPE_GET);

 

-	xi.destroyNode(newNode);

+	HXML query = xi.addChild(iq, NODENAME_QUERY, NULL);

+	xi.addChild(query, ATTRNAME_XMLNS, JABBER_FEAT_GTALK_SHARED_STATUS);

+	xi.addAttrInt(query, _T("version"), 2);

 

-	ji->AddTemporaryIqHandler(DiscoverHandler, JABBER_IQ_TYPE_RESULT, id, NULL, RESPONSE_TIMEOUT);

-	TlsSetValue(itlsRecursion, (PVOID)FALSE);

-	return FALSE;

+	HXML statNode = xi.addChild(query, _T("status"), msg);

+	if ( !lstrcmp(status, _T("invisible"))) {

+		xi.addChild(query, _T("show"), _T("default"));

+		xi.addAttr( xi.addChild(query, _T("invisible"), 0), _T("value"), _T("true"));

+	}

+	else {

+		if ( !lstrcmp(status, _T("dnd")))

+			xi.addChild(query, _T("show"), _T("dnd"));

+		else

+			xi.addChild(query, _T("show"), _T("default"));

+

+		xi.addAttr( xi.addChild(query, _T("invisible"), 0), _T("value"), _T("false"));

+	}

+	m_bGoogleSharedStatusLock = TRUE;

+	m_japi->SendXmlNode(iq);

+	xi.destroyNode(iq);

+}

+

+int OnServerDiscoInfo(WPARAM wParam, LPARAM lParam)

+{

+	GoogleTalkAcc *gta = isGoogle(lParam);

+	if (gta == NULL)

+		return FALSE;

+

+	// m_ThreadInfo->jabberServerCaps |= JABBER_CAPS_PING;

+

+	JABBER_DISCO_FIELD *fld = (JABBER_DISCO_FIELD*)wParam;

+	if ( !lstrcmp(fld->category, _T("server")) && !lstrcmp(fld->type, _T("im")) && !lstrcmp(fld->name, _T("Google Talk"))) {

+		HXML iq = xi.createNode(NODENAME_IQ, NULL, FALSE);

+		xi.addAttr(iq, ATTRNAME_TYPE, IQTYPE_GET);

+

+		HXML query = xi.addChild(iq, NODENAME_QUERY, NULL);

+		xi.addChild(query, ATTRNAME_XMLNS, JABBER_FEAT_GTALK_SHARED_STATUS);

+		xi.addAttrInt(query, _T("version"), 2);

+		gta->m_japi->SendXmlNode(iq);

+		xi.destroyNode(iq);

+	}

+	return 0;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -362,8 +429,8 @@ BOOL SendHandler(IJabberInterface *ji, HXML node, void *pUserData)
 

 int OnExtListInit(WPARAM wParam, LPARAM lParam)

 {

-	IJabberInterface *japi = (IJabberInterface*)lParam;

-	if (g_accs.indexOf(japi) != -1) {

+	GoogleTalkAcc *gta = isGoogle(lParam);

+	if (gta != NULL) {

 		LIST<TCHAR> *pList = (LIST<TCHAR>*)wParam;

 		pList->insert(JABBER_EXT_GTALK_PMUC);

 	}

@@ -385,31 +452,33 @@ int OnFilterPopup(WPARAM wParam, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-int AccListChanged(WPARAM wParam, LPARAM lParam)

-{

-	if (wParam == PRAC_ADDED) {

-		IJabberInterface *ji = getJabberApi(((PROTOACCOUNT*)lParam)->szModuleName);

-		if (ji) {

-			g_accs.insert(ji);

-			ji->AddSendHandler(SendHandler);

-		}

-	}

-	return 0;

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

-IJabberInterface* IsGoogleAccount(LPCSTR szModuleName)

+static void sttCreateInstance(LPCSTR szModuleName)

 {

 	IJabberInterface *japi = getJabberApi(szModuleName);

-	if (!japi)

-		return NULL;

+	if (japi == NULL)

+		return;

 

 	ptrA host( db_get_sa(NULL, szModuleName, "ManualHost"));

-	if (host == NULL)

-		return NULL;

+	if (host == NULL || strcmp(host, "talk.google.com"))

+		return;

+

+	GoogleTalkAcc *gta = new GoogleTalkAcc();

+	gta->m_japi = japi;

+	gta->m_pa = ProtoGetAccount(szModuleName);

+	g_accs.insert(gta);

+

+	// Google Shared Status (http://code.google.com/apis/talk/jep_extensions/shared_status.html)

+	japi->AddIqHandler(::OnIqResultGoogleSharedStatus, JABBER_IQ_TYPE_SET, JABBER_FEAT_GTALK_SHARED_STATUS, NULL);

+	japi->AddIqHandler(::OnIqResultGoogleSharedStatus, JABBER_IQ_TYPE_GET, JABBER_FEAT_GTALK_SHARED_STATUS, NODENAME_QUERY);

 

-	return ( !strcmp(host, "talk.google.com")) ? japi : NULL;

+	japi->AddSendHandler(SendHandler);

+}

+

+int AccListChanged(WPARAM wParam, LPARAM lParam)

+{

+	if (wParam == PRAC_ADDED)

+		sttCreateInstance(((PROTOACCOUNT*)lParam)->szModuleName);

+	return 0;

 }

 

 int ModulesLoaded(WPARAM wParam, LPARAM lParam)

@@ -419,13 +488,8 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	int count;

 	PROTOACCOUNT **protos;

 	ProtoEnumAccounts(&count, &protos);

-	for (int i=0; i < count; i++) {

-		IJabberInterface *ji = IsGoogleAccount(protos[i]->szModuleName);

-		if (ji) {

-			g_accs.insert(ji);

-			ji->AddSendHandler(SendHandler);

-		}

-	}

+	for (int i=0; i < count; i++)

+		sttCreateInstance(protos[i]->szModuleName);

 

 	HookEvent(ME_POPUP_FILTER, OnFilterPopup);

 	HookEvent(ME_JABBER_EXTLISTINIT, OnExtListInit);

diff --git a/protocols/GTalkExt/src/handlers.h b/protocols/GTalkExt/src/handlers.h
index 3218cd2b1c..6c2ecf847c 100644
--- a/protocols/GTalkExt/src/handlers.h
+++ b/protocols/GTalkExt/src/handlers.h
@@ -21,8 +21,6 @@
 

 #pragma once

 

-extern HANDLE hModulesLoaded;

-

 int ModulesLoaded(WPARAM wParam, LPARAM lParam);

 int AccListChanged(WPARAM wParam, LPARAM lParam);

 int OptionsInitialization(WPARAM wParam, LPARAM lParam);

diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp
index 4102e4fbfc..fa9fe637a2 100644
--- a/protocols/GTalkExt/src/options.cpp
+++ b/protocols/GTalkExt/src/options.cpp
@@ -240,7 +240,7 @@ int OptionsInitialization(WPARAM wParam, LPARAM lParam)
 	}

 

 	for (int i=0; i < g_accs.getCount(); i++) {

-		LPCSTR szProto = g_accs[i]->GetModuleName();

+		LPCSTR szProto = g_accs[i]->m_pa->szModuleName;

 		PROTOACCOUNT *pa = ProtoGetAccount(szProto);

 		if (pa != NULL) {

 			OPTIONSDIALOGPAGE odp = { sizeof(odp) };

diff --git a/protocols/GTalkExt/src/stdafx.h b/protocols/GTalkExt/src/stdafx.h
index c65c0ddd99..7e8bc5669b 100644
--- a/protocols/GTalkExt/src/stdafx.h
+++ b/protocols/GTalkExt/src/stdafx.h
@@ -56,7 +56,9 @@
 #include <m_jabber.h>

 #include <m_langpack.h>

 #include <m_protosvc.h>

+#include <m_protocols.h>

 #include <m_protomod.h>

+#include <m_protoint.h>

 #include <m_options.h>

 #include <m_utils.h>

 #include <m_clist.h>

@@ -65,8 +67,10 @@
 #include <win2k.h>

 #pragma warning(pop)

 

+#include "googletalk.h"

+

 extern HINSTANCE g_hInst;

-extern LIST<IJabberInterface> g_accs;

+extern LIST<GoogleTalkAcc> g_accs;

 

 void SetAvatar(HANDLE hContact);

 BOOL InitAvaUnit(BOOL init);

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index d72f1b99c3..c040ff5f3a 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -63,7 +63,7 @@ BOOL   jabberChatDllPresent = FALSE;
 

 HANDLE hExtraActivity = NULL;

 HANDLE hExtraMood = NULL;

-HANDLE hExtListInit;

+HANDLE hExtListInit, hDiscoInfoResult;

 

 void JabberUserInfoInit(void);

 

@@ -204,6 +204,7 @@ extern "C" int __declspec(dllexport) Load()
 	setlocale(LC_ALL, "");

 

 	hExtListInit = CreateHookableEvent(ME_JABBER_EXTLISTINIT);

+	hDiscoInfoResult = CreateHookableEvent(ME_JABBER_SRVDISCOINFO);

 

 	// Register protocol module

 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };

@@ -228,6 +229,8 @@ extern "C" int __declspec(dllexport) Load()
 extern "C" int __declspec(dllexport) Unload(void)

 {

 	DestroyHookableEvent(hExtListInit);

+	DestroyHookableEvent(hDiscoInfoResult);

+

 	g_MenuUninit();

 

 	g_Instances.destroy();

diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h
index 697c8b5c2e..eefd600481 100644
--- a/protocols/JabberG/src/jabber.h
+++ b/protocols/JabberG/src/jabber.h
@@ -386,7 +386,6 @@ struct ThreadData
 	void  shutdown(void);

 	int   recv(char* buf, size_t len);

 	int   send(char* buffer, int bufsize = -1);

-//	int   send(const char* fmt, ...);

 	int   send(HXML node);

 

 	int   recvws(char* buffer, size_t bufsize, int flags);

@@ -589,6 +588,10 @@ extern struct CountryListEntry* g_countries;
 

 extern FI_INTERFACE *FIP;

 

+extern CRITICAL_SECTION mutex;

+extern HANDLE hExtListInit, hDiscoInfoResult;

+extern int bSecureIM, bMirOTR, bNewGPG, bPlatform;

+

 /*******************************************************************

  * Function declarations

  *******************************************************************/

@@ -737,7 +740,6 @@ TCHAR*        __stdcall JabberErrorStr(int errorCode);
 TCHAR*        __stdcall JabberErrorMsg(HXML errorNode, int* errorCode = NULL);

 void          __stdcall JabberUtfToTchar(const char* str, size_t cbLen, LPTSTR& dest);

 time_t        __stdcall JabberIsoToUnixTime(const TCHAR *stamp);

-void          __stdcall JabberStringAppend(char* *str, int *sizeAlloced, const char* fmt, ...);

 TCHAR*        __stdcall JabberStripJid(const TCHAR *jid, TCHAR* dest, size_t destLen);

 int           __stdcall JabberGetPacketID(HXML n);

 

diff --git a/protocols/JabberG/src/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h
index feb2161513..570463396b 100644
--- a/protocols/JabberG/src/jabber_caps.h
+++ b/protocols/JabberG/src/jabber_caps.h
@@ -182,7 +182,6 @@ typedef unsigned __int64 JabberCapsBits;
 #define JABBER_FEAT_IQ_ROSTER                   _T("jabber:iq:roster")

 #define JABBER_FEAT_DELAY                       _T("jabber:x:delay")

 #define JABBER_FEAT_ENTITY_TIME_OLD             _T("jabber:iq:time")

-#define JABBER_FEAT_GTALK_SHARED_STATUS         _T("google:shared-status")

 

 #define JABBER_FEAT_MUC_ADMIN                   _T("http://jabber.org/protocol/muc#admin")

 #define JABBER_FEAT_MUC_OWNER                   _T("http://jabber.org/protocol/muc#owner")

diff --git a/protocols/JabberG/src/jabber_disco.h b/protocols/JabberG/src/jabber_disco.h
index 31818912c3..cec8845952 100644
--- a/protocols/JabberG/src/jabber_disco.h
+++ b/protocols/JabberG/src/jabber_disco.h
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define JABBER_DISCO_RESULT_ERROR					-1

 #define JABBER_DISCO_RESULT_OK						-2

 

-class CJabberSDIdentity;

 class CJabberSDIdentity

 {

 protected:

diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp
index acf1c0e6ae..868a293881 100644
--- a/protocols/JabberG/src/jabber_iq.cpp
+++ b/protocols/JabberG/src/jabber_iq.cpp
@@ -111,9 +111,6 @@ void CJabberProto::IqAdd(unsigned int iqId, JABBER_IQ_PROCID procId, JABBER_IQ_P
 

 BOOL CJabberIqManager::FillPermanentHandlers()

 {

-	// Google Shared Status (http://code.google.com/apis/talk/jep_extensions/shared_status.html)

-	AddPermanentHandler(&CJabberProto::OnIqSetGoogleSharedStatus, JABBER_IQ_TYPE_SET, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_TO | JABBER_IQ_PARSE_ID_STR, _T("google:shared-status"), FALSE, _T("query"));

-

 	// version requests (XEP-0092)

 	AddPermanentHandler(&CJabberProto::OnIqRequestVersion, JABBER_IQ_TYPE_GET, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_ID_STR, JABBER_FEAT_VERSION, FALSE, _T("query"));

 

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index f226f5b7af..5ef126bcbd 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -43,26 +43,20 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode)
 

 	HXML identity;

 	for (int i = 1; (identity = xmlGetNthChild(query, _T("identity"), i)) != NULL; i++) {

-		const TCHAR *identityCategory = xmlGetAttrValue(identity, _T("category"));

-		const TCHAR *identityType = xmlGetAttrValue(identity, _T("type"));

-		const TCHAR *identityName = xmlGetAttrValue(identity, _T("name"));

-		if (identityCategory && identityType && !_tcscmp(identityCategory, _T("pubsub")) && !_tcscmp(identityType, _T("pep"))) {

+		JABBER_DISCO_FIELD tmp = { 

+			xmlGetAttrValue(identity, _T("category")),

+			xmlGetAttrValue(identity, _T("type")),

+			xmlGetAttrValue(identity, _T("name")) };

+

+		if ( !lstrcmp(tmp.category, _T("pubsub")) && !lstrcmp(tmp.type, _T("pep"))) {

 			m_bPepSupported = TRUE;

 

 			EnableMenuItems(TRUE);

 			RebuildInfoFrame();

+			continue;

 		}

-		else if (identityCategory && identityType && identityName &&

-			!_tcscmp(identityCategory, _T("server")) &&

-			!_tcscmp(identityType, _T("im")) &&

-			!_tcscmp(identityName, _T("Google Talk"))) {

-				m_ThreadInfo->jabberServerCaps |= JABBER_CAPS_PING;

-

-				// Google Shared Status

-				m_ThreadInfo->send(

-					XmlNodeIq(m_iqManager.AddHandler(&CJabberProto::OnIqResultGoogleSharedStatus, JABBER_IQ_TYPE_GET))

-						<< XQUERY(JABBER_FEAT_GTALK_SHARED_STATUS) << XATTR(_T("version"), _T("2")));

-		}

+

+		NotifyFastHook(hDiscoInfoResult, (WPARAM)&tmp, (LPARAM)(IJabberInterface*)this);

 	}

 

 	if (m_ThreadInfo) {

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index b1cc88bc0a..a9a994ec6f 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -162,13 +162,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	int  __cdecl JabberGcEventHook(WPARAM, LPARAM);

 	int  __cdecl JabberGcMenuHook(WPARAM, LPARAM);

 

-	// Google Shared Status

-	BOOL m_bGoogleSharedStatus;

-	BOOL m_bGoogleSharedStatusLock;

-	void OnIqResultGoogleSharedStatus(HXML iqNode, CJabberIqInfo* pInfo);

-	BOOL OnIqSetGoogleSharedStatus(HXML iqNode, CJabberIqInfo* pInfo);

-	void SendIqGoogleSharedStatus(int status, const TCHAR *msg);

-

 	//====| Data |========================================================================

 

 	ThreadData* m_ThreadInfo;

diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 132395ddd6..84765938a2 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -25,10 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "jabber_caps.h"

 

-extern CRITICAL_SECTION mutex;

-extern HANDLE hExtListInit;

-extern int bSecureIM, bMirOTR, bNewGPG, bPlatform;

-

 int CJabberProto::SerialNext(void)

 {

 	return ::InterlockedIncrement(&m_nSerial);

@@ -681,8 +677,7 @@ void CJabberProto::SendPresenceTo(int status, TCHAR* to, HXML extra, const TCHAR
 			if (!msg) msg = m_modeMsgs.szOnline;

 			break;

 		case ID_STATUS_INVISIBLE:

-			if (!m_bGoogleSharedStatus)

-				p << XATTR(_T("type"), _T("invisible"));

+			p << XATTR(_T("type"), _T("invisible"));

 			break;

 		case ID_STATUS_AWAY:

 		case ID_STATUS_ONTHEPHONE:

@@ -709,9 +704,6 @@ void CJabberProto::SendPresenceTo(int status, TCHAR* to, HXML extra, const TCHAR
 

 		if (msg)

 			p << XCHILD(_T("status"), msg);

-

-		if (m_bGoogleSharedStatus && !to)

-			SendIqGoogleSharedStatus(status, msg);

 	}

 

 	m_ThreadInfo->send(p);

@@ -733,88 +725,6 @@ void CJabberProto::SendPresence(int status, bool bSendToAll)
 				SendPresenceTo(status == ID_STATUS_INVISIBLE ? ID_STATUS_ONLINE : status, text, NULL);

 }	}	}	}

 

-/////////////////////////////////////////////////////////////////////////////////////////

-// Google Shared Status

-

-void CJabberProto::OnIqResultGoogleSharedStatus(HXML iqNode, CJabberIqInfo* pInfo) {

-	m_bGoogleSharedStatus = (JABBER_IQ_TYPE_RESULT == pInfo->GetIqType());

-	m_bGoogleSharedStatusLock = FALSE;

-}

-

-BOOL CJabberProto::OnIqSetGoogleSharedStatus(HXML iqNode, CJabberIqInfo* pInfo) {

-	if (JABBER_IQ_TYPE_SET != pInfo->GetIqType()) return FALSE;

-	if (m_bGoogleSharedStatusLock) return TRUE;

-

-	int status;

-	HXML query = xmlGetChild(iqNode, _T("query"));

-	HXML node = xmlGetChild(query, _T("invisible"));

-	if (0 == _tcsicmp(_T("true"), xmlGetAttrValue(node, _T("value"))))

-		status = ID_STATUS_INVISIBLE;

-	else {

-		LPCTSTR txt = xmlGetText(xmlGetChild(query, _T("show")));

-		if (txt && 0 == _tcsicmp(_T("dnd"), txt))

-			status = ID_STATUS_DND;

-		else if (m_iStatus == ID_STATUS_DND || m_iStatus == ID_STATUS_INVISIBLE)

-			status = ID_STATUS_ONLINE;

-		else

-			status = m_iStatus;

-	}

-

-	if (status != m_iStatus) SetStatus(status);

-

-	return TRUE;

-}

-

-void CJabberProto::SendIqGoogleSharedStatus(int status, const TCHAR *msg) {

-	XmlNodeIq iq(m_iqManager.AddHandler(&CJabberProto::OnIqResultGoogleSharedStatus, JABBER_IQ_TYPE_SET));

-	HXML query = iq << XQUERY(JABBER_FEAT_GTALK_SHARED_STATUS) << XATTR(_T("version"), _T("2"));

-	query << XCHILD(_T("status"), msg);

-	if (status == ID_STATUS_INVISIBLE) {

-		query << XCHILD(_T("show"), _T("default"));

-		query << XCHILD(_T("invisible")) << XATTR(_T("value"), _T("true"));

-	}

-	else {

-		if (status == ID_STATUS_DND)

-			query << XCHILD(_T("show"), _T("dnd"));

-		else

-			query << XCHILD(_T("show"), _T("default"));

-

-		query << XCHILD(_T("invisible")) << XATTR(_T("value"), _T("false"));

-	}

-	m_bGoogleSharedStatusLock = TRUE;

-	m_ThreadInfo->send(iq);

-}

-

-void __stdcall JabberStringAppend(char* *str, int *sizeAlloced, const char* fmt, ...)

-{

-	va_list vararg;

-	char* p;

-	size_t size, len;

-

-	if (str == NULL) return;

-

-	if (*str == NULL || *sizeAlloced<=0) {

-		*sizeAlloced = 2048;

-        size = 2048;

-		*str = (char*)mir_alloc(size);

-		len = 0;

-	}

-	else {

-		len = strlen(*str);

-		size = *sizeAlloced - strlen(*str);

-	}

-

-	p = *str + len;

-	va_start(vararg, fmt);

-	while (mir_vsnprintf(p, size, fmt, vararg) == -1) {

-		size += 2048;

-		(*sizeAlloced) += 2048;

-		*str = (char*)mir_realloc(*str, *sizeAlloced);

-		p = *str + len;

-	}

-	va_end(vararg);

-}

-

 ///////////////////////////////////////////////////////////////////////////////

 // JabberGetPacketID - converts the xml id attribute into an integer