From c895a54b5fe3db2aa8159d17504070e1eb4d49c7 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Thu, 18 Oct 2012 19:37:53 +0000 Subject: reverted the android icon change from r1971, because no icon pack supports it :( git-svn-id: http://svn.miranda-ng.org/main/trunk@1975 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_thread.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index c8674bd943..49589b8c52 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1664,9 +1664,9 @@ void CJabberProto::OnProcessPresence( HXML node, ThreadData* info ) DBCheckIsTransportedContact( from, hContact ); int status = ID_STATUS_ONLINE; /* GTalk android user set status as on the phone */ - if (_tcsstr(from, _T("android_talk"))) - status = ID_STATUS_ONTHEPHONE; - else { +// if (_tcsstr(from, _T("android_talk"))) +// status = ID_STATUS_ONTHEPHONE; +// else { if (( showNode = xmlGetChild( node , "show" )) != NULL ) { if (( show = xmlGetText( showNode ) ) != NULL ) { if ( !_tcscmp( show, _T("away"))) status = ID_STATUS_AWAY; @@ -1675,7 +1675,7 @@ void CJabberProto::OnProcessPresence( HXML node, ThreadData* info ) else if ( !_tcscmp( show, _T("chat"))) status = ID_STATUS_FREECHAT; } } - } +// } char priority = 0; -- cgit v1.2.3