summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_thread.cpp
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2012-10-18 19:37:53 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2012-10-18 19:37:53 +0000
commitc895a54b5fe3db2aa8159d17504070e1eb4d49c7 (patch)
tree8a982035d2fcdbb79493a194a29d842994f5b29d /protocols/JabberG/src/jabber_thread.cpp
parented96a9cb20351fa4e1017a4a0556a060947d0194 (diff)
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
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
-rw-r--r--protocols/JabberG/src/jabber_thread.cpp8
1 files changed, 4 insertions, 4 deletions
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;