diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-03 15:16:37 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-03 15:16:37 +0000 |
| commit | 78f8991554dd09d2e7f7efcdd9dcacf18f75f428 (patch) | |
| tree | ef50761216cd51b0da6cb17b3ca1199de10fb6cf /protocols/JabberG/jabber_proto.cpp | |
| parent | cfe2d8b10186a7ed42ba0dffd75528a38bee1435 (diff) | |
old svn info removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@735 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_proto.cpp')
| -rw-r--r-- | protocols/JabberG/jabber_proto.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/protocols/JabberG/jabber_proto.cpp b/protocols/JabberG/jabber_proto.cpp index cfe4c40a23..58d8d515c5 100644 --- a/protocols/JabberG/jabber_proto.cpp +++ b/protocols/JabberG/jabber_proto.cpp @@ -2,7 +2,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright ( C ) 2002-04 Santithorn Bunchua
-Copyright ( C ) 2005-11 George Hazan
+Copyright ( C ) 2005-12 George Hazan
Copyright ( C ) 2007 Maxim Mluhov
This program is free software; you can redistribute it and/or
@@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-Revision : $Revision: 7044 $
-Last change on : $Date: 2008-01-04 22:42:50 +0300 (Пт, 04 янв 2008) $
-Last change by : $Author: m_mluhov $
-
*/
#include "jabber.h"
@@ -1094,10 +1090,10 @@ HANDLE __cdecl CJabberProto::SendFile( HANDLE hContact, const TCHAR* szDescripti return 0;
}
- JabberCapsBits jcb = GetResourceCapabilites( item->jid, TRUE );
- if ( jcb == JABBER_RESOURCE_CAPS_IN_PROGRESS ) {
+ JabberCapsBits jcb = GetTotalJidCapabilites( item->jid );
+ if (( jcb & JABBER_RESOURCE_CAPS_IN_PROGRESS ) == JABBER_RESOURCE_CAPS_IN_PROGRESS ) {
Sleep(600);
- jcb = GetResourceCapabilites( item->jid, TRUE );
+ jcb = GetTotalJidCapabilites( item->jid );
}
// fix for very smart clients, like gajim
@@ -1242,10 +1238,6 @@ int __cdecl CJabberProto::SendMsg( HANDLE hContact, int flags, const char* pszSr TCHAR szClientJid[ JABBER_MAX_JID_LEN ];
GetClientJID( dbv.ptszVal, szClientJid, SIZEOF( szClientJid ));
- JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID( szClientJid );
- if ( r )
- r->bMessageSessionActive = TRUE;
-
JabberCapsBits jcb = GetResourceCapabilites( szClientJid, TRUE );
if ( jcb & JABBER_RESOURCE_CAPS_ERROR )
|