diff options
Diffstat (limited to 'protocols/GTalkExt/src')
| -rw-r--r-- | protocols/GTalkExt/src/handlers.cpp | 14 | ||||
| -rw-r--r-- | protocols/GTalkExt/src/inbox.cpp | 2 | ||||
| -rw-r--r-- | protocols/GTalkExt/src/notifications.cpp | 6 | ||||
| -rw-r--r-- | protocols/GTalkExt/src/tipper_items.cpp | 4 | 
4 files changed, 13 insertions, 13 deletions
diff --git a/protocols/GTalkExt/src/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp index af6f5bc8f8..361c33463b 100644 --- a/protocols/GTalkExt/src/handlers.cpp +++ b/protocols/GTalkExt/src/handlers.cpp @@ -153,7 +153,7 @@ BOOL MailListHandler(IJabberInterface *ji, HXML node, void *pUserData)  {
  	LPCTSTR jidWithRes = xi.getAttrValue(node, ATTRNAME_TO);
  	__try {
 -		if (!node || lstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_RESULT)) return TRUE;
 +		if (!node || mir_tstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_RESULT)) return TRUE;
  		LPCTSTR jid = xi.getAttrValue(node, ATTRNAME_FROM);
  		assert(jid);
 @@ -298,7 +298,7 @@ BOOL SendHandler(IJabberInterface *ji, HXML node, void *pUserData)  	 		ji->AddTemporaryIqHandler(DiscoverHandler, JABBER_IQ_TYPE_RESULT, _ttoi(ptszId+4), NULL, RESPONSE_TIMEOUT, 500);
  	}
 -	if ( !lstrcmp(xi.getName(node), _T("presence")) && xi.getAttrValue(node, ATTRNAME_TO) == 0) {
 +	if ( !mir_tstrcmp(xi.getName(node), _T("presence")) && xi.getAttrValue(node, ATTRNAME_TO) == 0) {
  		if (!gta->m_bGoogleSharedStatus)
  			return FALSE;
 @@ -321,7 +321,7 @@ BOOL OnIqResultGoogleSharedStatus(IJabberInterface *ji, HXML node, void *pUserDa  {
  	GoogleTalkAcc *gta = isGoogle(LPARAM(ji));
  	if (gta != NULL) {
 -		gta->m_bGoogleSharedStatus = lstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_RESULT) == 0;
 +		gta->m_bGoogleSharedStatus = mir_tstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_RESULT) == 0;
  		gta->m_bGoogleSharedStatusLock = FALSE;
  	}
  	return FALSE;
 @@ -332,7 +332,7 @@ BOOL OnIqSetGoogleSharedStatus(IJabberInterface *ji, HXML iqNode, void *pUserDat  	GoogleTalkAcc *gta = isGoogle(LPARAM(ji));
  	if (gta == NULL)
  		return FALSE;
 -	if (lstrcmp(xi.getAttrValue(iqNode, ATTRNAME_TYPE), IQTYPE_SET))
 +	if (mir_tstrcmp(xi.getAttrValue(iqNode, ATTRNAME_TYPE), IQTYPE_SET))
  		return FALSE;
  	if (gta->m_bGoogleSharedStatusLock)
  		return TRUE;
 @@ -368,12 +368,12 @@ void GoogleTalkAcc::SendIqGoogleSharedStatus(LPCTSTR status, LPCTSTR msg)  	xi.addAttrInt(query, _T("version"), 2);
  	HXML statNode = xi.addChild(query, _T("status"), msg);
 -	if ( !lstrcmp(status, _T("invisible"))) {
 +	if ( !mir_tstrcmp(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")))
 +		if ( !mir_tstrcmp(status, _T("dnd")))
  			xi.addChild(query, _T("show"), _T("dnd"));
  		else
  			xi.addChild(query, _T("show"), _T("default"));
 @@ -394,7 +394,7 @@ int OnServerDiscoInfo(WPARAM wParam, LPARAM lParam)  	// 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"))) {
 +	if ( !mir_tstrcmp(fld->category, _T("server")) && !mir_tstrcmp(fld->type, _T("im")) && !mir_tstrcmp(fld->name, _T("Google Talk"))) {
  		HXML iq = xi.createNode(NODENAME_IQ, NULL, FALSE);
  		xi.addAttr(iq, ATTRNAME_TYPE, IQTYPE_GET);
 diff --git a/protocols/GTalkExt/src/inbox.cpp b/protocols/GTalkExt/src/inbox.cpp index 6ac9790478..6cf8958914 100644 --- a/protocols/GTalkExt/src/inbox.cpp +++ b/protocols/GTalkExt/src/inbox.cpp @@ -221,7 +221,7 @@ void OpenContactInbox(LPCSTR szModuleName)  	*host++ = 0;
  	TCHAR buf[1024];
 -	if (lstrcmpi(host, COMMON_GMAIL_HOST1) && lstrcmpi(host, COMMON_GMAIL_HOST2))
 +	if (mir_tstrcmpi(host, COMMON_GMAIL_HOST1) && mir_tstrcmpi(host, COMMON_GMAIL_HOST2))
  		mir_sntprintf(buf, SIZEOF(buf), INBOX_URL_FORMAT, _T("a/"), host);   // hosted
  	else
  		mir_sntprintf(buf, SIZEOF(buf), INBOX_URL_FORMAT, _T(""), _T("mail")); // common
 diff --git a/protocols/GTalkExt/src/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp index 5acef31604..ebd601737d 100644 --- a/protocols/GTalkExt/src/notifications.cpp +++ b/protocols/GTalkExt/src/notifications.cpp @@ -55,7 +55,7 @@ LPCSTR GetJidAcc(LPCTSTR jid)  	for (int i=0; i < count; i++) {
  		if ( getJabberApi(protos[i]->szModuleName)) {
  			ptrT tszJid( db_get_tsa(0, protos[i]->szModuleName, "jid"));
 -			if ( !lstrcmpi(jid, tszJid))
 +			if ( !mir_tstrcmpi(jid, tszJid))
  				return protos[i]->szModuleName;
  		}
  	}
 @@ -158,7 +158,7 @@ static bool DoAddPopup(POPUPDATAT *data)  void FormatPseudocontactDisplayName(LPTSTR buff, LPCTSTR jid, LPCTSTR unreadCount)
  {
 -	if (lstrcmp(unreadCount,  _T("0")))
 +	if (mir_tstrcmp(unreadCount,  _T("0")))
  		wsprintf(buff, _T("%s [%s]"), jid, unreadCount); //!!!!!!!!!!!
  	else
  		wsprintf(buff, _T("%s"), jid); //!!!!!!!!!!!
 @@ -322,7 +322,7 @@ BOOL CALLBACK ClosePopupFunc(__in  HWND hwnd, __in LPARAM lParam)  	if (!ppdh)
  		return TRUE;
 -	if (!lstrcmpi(ppis->url, ppdh->url) && !lstrcmpi(ppis->jid, ppdh->jid))
 +	if (!mir_tstrcmpi(ppis->url, ppdh->url) && !mir_tstrcmpi(ppis->jid, ppdh->jid))
  		SendMessage(hwnd, MESSAGE_CLOSEPOPUP, 0, 0);
  	return TRUE;
 diff --git a/protocols/GTalkExt/src/tipper_items.cpp b/protocols/GTalkExt/src/tipper_items.cpp index 53db8d216e..e2420305b9 100644 --- a/protocols/GTalkExt/src/tipper_items.cpp +++ b/protocols/GTalkExt/src/tipper_items.cpp @@ -82,7 +82,7 @@ void SetLabelProp(int index, LPSTR setting)  	if (tszLastWritten == NULL)
  		return;
 -	if ( !lstrcmp(tszProp, tszLastWritten)) {
 +	if ( !mir_tstrcmp(tszProp, tszLastWritten)) {
  		LPTSTR label = TranslateTS(UNREAD_THREADS_LABEL);
  		db_set_ts(0, SHORT_PLUGIN_NAME, LAST_WRITTEN_LABEL_SETTING, label);
  		db_set_ts(0, TIPPER_ITEMS_MOD_NAME, setting, label);
 @@ -105,7 +105,7 @@ void AddTipperItem()  		mir_snprintf(setting, l, VALUE_SETTING_PROP, i);
  		ptrT tszSetting( db_get_tsa(0, TIPPER_ITEMS_MOD_NAME, setting));
  		if (tszSetting) {
 -			if ( !lstrcmp(UNREAD_THREADS_RAW, tszSetting)) {
 +			if ( !mir_tstrcmp(UNREAD_THREADS_RAW, tszSetting)) {
  				SetLabelProp(i, setting);
  				return;
  			}
  | 
