diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-03 18:15:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-03 18:15:52 +0000 |
| commit | 4641ff7a3a0d6a124c22a5c044bffd04073720fc (patch) | |
| tree | dd0abb5de957189fc8dd18cd83b3cf97eafe853b /protocols/JabberG/jabber_proto.cpp | |
| parent | ad4e888349c2d220828c93d2d50635ff23a6fc72 (diff) | |
shit dropped out
git-svn-id: http://svn.miranda-ng.org/main/trunk@738 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_proto.cpp')
| -rw-r--r-- | protocols/JabberG/jabber_proto.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/protocols/JabberG/jabber_proto.cpp b/protocols/JabberG/jabber_proto.cpp index 58d8d515c5..8e6bc32294 100644 --- a/protocols/JabberG/jabber_proto.cpp +++ b/protocols/JabberG/jabber_proto.cpp @@ -1090,10 +1090,10 @@ HANDLE __cdecl CJabberProto::SendFile( HANDLE hContact, const TCHAR* szDescripti return 0;
}
- JabberCapsBits jcb = GetTotalJidCapabilites( item->jid );
- if (( jcb & JABBER_RESOURCE_CAPS_IN_PROGRESS ) == JABBER_RESOURCE_CAPS_IN_PROGRESS ) {
+ JabberCapsBits jcb = GetResourceCapabilites( item->jid, TRUE );
+ if ( jcb == JABBER_RESOURCE_CAPS_IN_PROGRESS ) {
Sleep(600);
- jcb = GetTotalJidCapabilites( item->jid );
+ jcb = GetResourceCapabilites( item->jid, TRUE );
}
// fix for very smart clients, like gajim
@@ -1238,6 +1238,10 @@ 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 )
|