From 78f8991554dd09d2e7f7efcdd9dcacf18f75f428 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 3 Jul 2012 15:16:37 +0000 Subject: old svn info removed git-svn-id: http://svn.miranda-ng.org/main/trunk@735 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/jabber.cpp | 4 -- protocols/JabberG/jabber.h | 6 +- protocols/JabberG/jabber_adhoc.cpp | 94 +++++++++++++-------------- protocols/JabberG/jabber_agent.cpp | 6 +- protocols/JabberG/jabber_bookmarks.cpp | 4 -- protocols/JabberG/jabber_byte.cpp | 6 +- protocols/JabberG/jabber_byte.h | 6 +- protocols/JabberG/jabber_caps.cpp | 6 +- protocols/JabberG/jabber_caps.h | 6 +- protocols/JabberG/jabber_captcha.cpp | 6 +- protocols/JabberG/jabber_chat.cpp | 14 ++-- protocols/JabberG/jabber_console.cpp | 6 +- protocols/JabberG/jabber_db_utils.h | 6 +- protocols/JabberG/jabber_disco.cpp | 6 +- protocols/JabberG/jabber_disco.h | 6 +- protocols/JabberG/jabber_events.cpp | 6 +- protocols/JabberG/jabber_file.cpp | 6 +- protocols/JabberG/jabber_form.cpp | 6 +- protocols/JabberG/jabber_form2.cpp | 6 +- protocols/JabberG/jabber_form2.h | 6 +- protocols/JabberG/jabber_ft.cpp | 6 +- protocols/JabberG/jabber_groupchat.cpp | 42 ++++-------- protocols/JabberG/jabber_ibb.cpp | 6 +- protocols/JabberG/jabber_ibb.h | 6 +- protocols/JabberG/jabber_icolib.cpp | 6 +- protocols/JabberG/jabber_icolib.h | 6 +- protocols/JabberG/jabber_iq.cpp | 4 -- protocols/JabberG/jabber_iq.h | 6 +- protocols/JabberG/jabber_iq_handlers.cpp | 4 -- protocols/JabberG/jabber_iqid.cpp | 6 +- protocols/JabberG/jabber_iqid_muc.cpp | 6 +- protocols/JabberG/jabber_libstr.cpp | 6 +- protocols/JabberG/jabber_list.cpp | 55 +++++----------- protocols/JabberG/jabber_list.h | 17 ++--- protocols/JabberG/jabber_menu.cpp | 78 +++++++++------------- protocols/JabberG/jabber_message_handlers.cpp | 4 -- protocols/JabberG/jabber_message_manager.cpp | 4 -- protocols/JabberG/jabber_message_manager.h | 4 -- protocols/JabberG/jabber_misc.cpp | 17 ++--- protocols/JabberG/jabber_notes.cpp | 6 +- protocols/JabberG/jabber_notes.h | 6 +- protocols/JabberG/jabber_opt.cpp | 6 +- protocols/JabberG/jabber_opttree.cpp | 6 +- protocols/JabberG/jabber_opttree.h | 6 +- protocols/JabberG/jabber_password.cpp | 6 +- protocols/JabberG/jabber_presence_manager.cpp | 4 -- protocols/JabberG/jabber_presence_manager.h | 4 -- protocols/JabberG/jabber_privacy.cpp | 6 +- protocols/JabberG/jabber_privacy.h | 6 +- protocols/JabberG/jabber_proto.cpp | 16 ++--- protocols/JabberG/jabber_proto.h | 6 +- protocols/JabberG/jabber_proxy.cpp | 6 +- protocols/JabberG/jabber_proxy.h | 6 +- protocols/JabberG/jabber_rc.cpp | 6 +- protocols/JabberG/jabber_rc.h | 6 +- protocols/JabberG/jabber_search.cpp | 6 +- protocols/JabberG/jabber_search.h | 6 +- protocols/JabberG/jabber_secur.cpp | 6 +- protocols/JabberG/jabber_secur.h | 6 +- protocols/JabberG/jabber_send_manager.cpp | 4 -- protocols/JabberG/jabber_send_manager.h | 4 -- protocols/JabberG/jabber_std.cpp | 6 +- protocols/JabberG/jabber_svc.cpp | 6 +- protocols/JabberG/jabber_thread.cpp | 68 ++++++++++--------- protocols/JabberG/jabber_treelist.cpp | 6 +- protocols/JabberG/jabber_userinfo.cpp | 10 +-- protocols/JabberG/jabber_util.cpp | 15 +---- protocols/JabberG/jabber_vcard.cpp | 6 +- protocols/JabberG/jabber_ws.cpp | 6 +- protocols/JabberG/jabber_xml.cpp | 6 +- protocols/JabberG/jabber_xml.h | 6 +- protocols/JabberG/jabber_xstatus.cpp | 6 +- protocols/JabberG/jabber_xstatus.h | 6 +- protocols/JabberG/jabber_zstream.cpp | 6 +- protocols/JabberG/ui_utils.cpp | 4 -- protocols/JabberG/ui_utils.h | 6 +- 76 files changed, 221 insertions(+), 571 deletions(-) diff --git a/protocols/JabberG/jabber.cpp b/protocols/JabberG/jabber.cpp index a325778bcd..99752bffa6 100644 --- a/protocols/JabberG/jabber.cpp +++ b/protocols/JabberG/jabber.cpp @@ -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: 13829 $ -Last change on : $Date: 2011-09-04 05:19:45 +0300 (Вс, 04 сен 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber.h b/protocols/JabberG/jabber.h index 6cc58b4fb4..3958213fdd 100644 --- a/protocols/JabberG/jabber.h +++ b/protocols/JabberG/jabber.h @@ -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: 14085 $ -Last change on : $Date: 2012-02-13 12:55:56 +0200 (Пн, 13 фев 2012) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_H_ diff --git a/protocols/JabberG/jabber_adhoc.cpp b/protocols/JabberG/jabber_adhoc.cpp index cb398fa5f7..09884e79df 100644 --- a/protocols/JabberG/jabber_adhoc.cpp +++ b/protocols/JabberG/jabber_adhoc.cpp @@ -2,10 +2,10 @@ Jabber Protocol Plugin for Miranda IM Copyright ( C ) 2002-04 Santithorn Bunchua -Copyright ( C ) 2005-11 George Hazan Copyright ( C ) 2007 Artem Shpynov +Copyright ( C ) 2005-12 George Hazan -Module implements an XMPP protocol extension for reporting and executing ad-hoc, +Module implements an XMPP protocol extension for reporting and executing ad-hoc, human-oriented commands according to XEP-0050: Ad-Hoc Commands http://www.xmpp.org/extensions/xep-0050.html @@ -23,10 +23,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" @@ -39,7 +35,7 @@ Last change by : $Author: borkra $ #define ShowDlgItem( a, b, c ) ShowWindow( GetDlgItem( a, b ), c ) #define EnableDlgItem( a, b, c ) EnableWindow( GetDlgItem( a, b ), c ) -enum +enum { JAHM_COMMANDLISTRESULT = WM_USER+1, JAHM_PROCESSRESULT @@ -69,7 +65,7 @@ static BOOL CALLBACK sttDeleteChildWindowsProc( HWND hwnd, LPARAM ) static void sttEnableControls( HWND hwndDlg, BOOL bEnable, const int * controlsID ) { int i=0; - while ( controlsID[i]!=0 ) + while ( controlsID[i]!=0 ) EnableDlgItem( hwndDlg, controlsID[i++], bEnable ); } @@ -119,7 +115,7 @@ int CJabberProto::AdHoc_RequestListOfCommands( TCHAR * szResponder, HWND hwndDlg { int iqId = (int)hwndDlg; IqAdd( iqId, IQ_PROC_DISCOCOMMANDS, &CJabberProto::OnIqResult_ListOfCommands ); - m_ThreadInfo->send( XmlNodeIq( _T("get"), iqId, szResponder ) << XQUERY( _T(JABBER_FEAT_DISCO_ITEMS)) + m_ThreadInfo->send( XmlNodeIq( _T("get"), iqId, szResponder ) << XQUERY( _T(JABBER_FEAT_DISCO_ITEMS)) << XATTR( _T("node"), _T(JABBER_FEAT_COMMANDS))); return iqId; } @@ -160,16 +156,16 @@ int CJabberProto::AdHoc_OnJAHMCommandListResult( HWND hwndDlg, HXML iqNode, Jabb TCHAR buff[255]; const TCHAR* code = NULL; const TCHAR* description = NULL; - + HXML errorNode = xmlGetChild( iqNode, "error" ); if ( errorNode ) { code = xmlGetAttrValue( errorNode, _T("code")); description = xmlGetText( errorNode ); } - _sntprintf( buff, SIZEOF(buff), TranslateT( "Error %s %s" ), (code) ? code : _T(""), (description) ? description : _T("")); + _sntprintf( buff, SIZEOF(buff), TranslateT( "Error %s %s" ), (code) ? code : _T(""), (description) ? description : _T("")); JabberFormSetInstruction( hwndDlg, buff ); - } - else if ( !_tcscmp( type, _T("result")) ) { + } + else if ( !_tcscmp( type, _T("result")) ) { BOOL validResponse = FALSE; EnumChildWindows( GetDlgItem( hwndDlg, IDC_FRAME ), sttDeleteChildWindowsProc, 0 ); dat->CurrentHeight = 0; @@ -201,7 +197,7 @@ int CJabberProto::AdHoc_OnJAHMCommandListResult( HWND hwndDlg, HXML iqNode, Jabb } } if (nodeIdx>1) { - JabberFormSetInstruction( hwndDlg, TranslateT("Select Command")); + JabberFormSetInstruction( hwndDlg, TranslateT("Select Command")); ShowDlgItem( hwndDlg, IDC_FRAME, SW_SHOW); ShowDlgItem( hwndDlg, IDC_VSCROLL, SW_SHOW); EnableDlgItem( hwndDlg, IDC_SUBMIT, TRUE); @@ -227,7 +223,7 @@ int CJabberProto::AdHoc_OnJAHMProcessResult(HWND hwndDlg, HXML workNode, JabberA const TCHAR *type; if (( type = xmlGetAttrValue( workNode, _T("type"))) == NULL ) return TRUE; - if ( !lstrcmp( type, _T("result")) ) { + if ( !lstrcmp( type, _T("result")) ) { // wParam = node from responder as a result of command execution HXML commandNode, xNode, n; if (( commandNode = xmlGetChild( dat->AdHocNode, _T("command"))) == NULL ) @@ -248,10 +244,10 @@ int CJabberProto::AdHoc_OnJAHMProcessResult(HWND hwndDlg, HXML workNode, JabberA JabberFormSetInstruction(hwndDlg, TranslateTS(status)); JabberFormCreateUI( hFrame, xNode, &dat->CurrentHeight ); ShowDlgItem( hwndDlg, IDC_FRAME , SW_SHOW); - } + } else { //NO X FORM - int toHide[]={ IDC_FRAME_TEXT, IDC_FRAME, IDC_VSCROLL, 0}; + int toHide[]={ IDC_FRAME_TEXT, IDC_FRAME, IDC_VSCROLL, 0}; sttShowControls(hwndDlg, FALSE, toHide ); const TCHAR * noteText=NULL; @@ -269,11 +265,11 @@ int CJabberProto::AdHoc_OnJAHMProcessResult(HWND hwndDlg, HXML workNode, JabberA ShowDlgItem( hwndDlg, IDC_NEXT, ( xmlGetChild( actionsNode , "next")!=NULL) ? SW_SHOW : SW_HIDE); ShowDlgItem( hwndDlg, IDC_COMPLETE, ( xmlGetChild( actionsNode , "complete")!=NULL) ? SW_SHOW : SW_HIDE); ShowDlgItem( hwndDlg, IDC_SUBMIT, SW_HIDE); - - int toEnable[]={ IDC_PREV, IDC_NEXT, IDC_COMPLETE, 0}; + + int toEnable[]={ IDC_PREV, IDC_NEXT, IDC_COMPLETE, 0}; sttEnableControls( hwndDlg, TRUE, toEnable ); } else { - int toHide[]={ IDC_PREV, IDC_NEXT, IDC_COMPLETE, 0}; + int toHide[]={ IDC_PREV, IDC_NEXT, IDC_COMPLETE, 0}; sttShowControls(hwndDlg, FALSE, toHide ); ShowDlgItem(hwndDlg,IDC_SUBMIT, SW_SHOW); @@ -283,14 +279,14 @@ int CJabberProto::AdHoc_OnJAHMProcessResult(HWND hwndDlg, HXML workNode, JabberA if (!status || _tcscmp(status,_T("executing"))) { ShowDlgItem( hwndDlg, IDC_SUBMIT, SW_HIDE); SetWindowText(GetDlgItem(hwndDlg,IDCANCEL), TranslateT("Done")); - } } - else if ( !lstrcmp( type, _T("error"))) { + } } + else if ( !lstrcmp( type, _T("error"))) { // error occurred here int toHide[]={ IDC_FRAME, IDC_FRAME_TEXT, IDC_VSCROLL, - IDC_PREV, IDC_NEXT, IDC_COMPLETE, IDC_SUBMIT, 0}; - + IDC_PREV, IDC_NEXT, IDC_COMPLETE, IDC_SUBMIT, 0}; + sttShowControls(hwndDlg, FALSE, toHide ); - + const TCHAR* code=NULL; const TCHAR* description=NULL; TCHAR buff[255]; @@ -299,7 +295,7 @@ int CJabberProto::AdHoc_OnJAHMProcessResult(HWND hwndDlg, HXML workNode, JabberA code = xmlGetAttrValue( errorNode, _T("code")); description = xmlGetText( errorNode ); } - _sntprintf(buff,SIZEOF(buff),TranslateT("Error %s %s"),code ? code : _T(""),description?description:_T("")); + _sntprintf(buff,SIZEOF(buff),TranslateT("Error %s %s"),code ? code : _T(""),description?description:_T("")); JabberFormSetInstruction(hwndDlg,buff); } JabberAdHoc_RefreshFrameScroll( hwndDlg, dat ); @@ -315,29 +311,29 @@ int CJabberProto::AdHoc_SubmitCommandForm(HWND hwndDlg, JabberAdHocData* dat, TC int iqId = (int)hwndDlg; XmlNodeIq iq( _T("set"), iqId, xmlGetAttrValue( dat->AdHocNode, _T("from"))); HXML command = iq << XCHILDNS( _T("command"), _T(JABBER_FEAT_COMMANDS)); - + const TCHAR* sessionId = xmlGetAttrValue( commandNode, _T("sessionid")); - if ( sessionId ) + if ( sessionId ) command << XATTR( _T("sessionid"), sessionId ); - + const TCHAR* node = xmlGetAttrValue( commandNode, _T("node")); - if ( node ) + if ( node ) command << XATTR( _T("node"), node ); - - if ( action ) + + if ( action ) command << XATTR( _T("action"), action ); - + xmlAddChild( command, dataNode ); IqAdd( iqId, IQ_PROC_EXECCOMMANDS, &CJabberProto::OnIqResult_CommandExecution ); m_ThreadInfo->send( iq ); - + xi.destroyNode( dataNode ); JabberFormSetInstruction(hwndDlg,TranslateT("In progress. Please Wait...")); - + static const int toDisable[]={IDC_SUBMIT, IDC_PREV, IDC_NEXT, IDC_COMPLETE, 0}; sttEnableControls( hwndDlg, FALSE, toDisable); - + return TRUE; } @@ -379,7 +375,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc( HWND hwndDlg, UINT msg, WPAR CJabberAdhocStartupParams* pStartupParams = (CJabberAdhocStartupParams *)lParam; dat=(JabberAdHocData *)mir_alloc(sizeof(JabberAdHocData)); memset(dat,0,sizeof(JabberAdHocData)); - + //hmmm, useless code? if (dat->ResponderJID) mir_free(dat->ResponderJID); dat->ResponderJID = mir_tstrdup(pStartupParams->m_szJid); dat->proto = pStartupParams->m_pProto; @@ -394,15 +390,15 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc( HWND hwndDlg, UINT msg, WPAR frameExStyle |= WS_EX_CONTROLPARENT; SetWindowLongPtr( GetDlgItem( hwndDlg, IDC_FRAME ), GWL_EXSTYLE, frameExStyle ); - - int toHide[]={ IDC_FRAME, IDC_VSCROLL, IDC_PREV, IDC_NEXT, IDC_COMPLETE, IDC_FRAME_TEXT, 0}; + + int toHide[]={ IDC_FRAME, IDC_VSCROLL, IDC_PREV, IDC_NEXT, IDC_COMPLETE, IDC_FRAME_TEXT, 0}; sttShowControls(hwndDlg, FALSE, toHide ); - - int toShow[]={ IDC_INSTRUCTION, IDC_SUBMIT, IDCANCEL, 0}; + + int toShow[]={ IDC_INSTRUCTION, IDC_SUBMIT, IDCANCEL, 0}; sttShowControls(hwndDlg, TRUE, toShow ); EnableDlgItem(hwndDlg,IDC_VSCROLL,TRUE); - + SetWindowPos(GetDlgItem(hwndDlg,IDC_VSCROLL),HWND_BOTTOM,0,0,0,0,SWP_NOSIZE|SWP_NOMOVE); SetDlgItemText(hwndDlg,IDC_SUBMIT, TranslateT("Execute")); @@ -421,7 +417,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc( HWND hwndDlg, UINT msg, WPAR dat->proto->IqAdd( iqId, IQ_PROC_EXECCOMMANDS, &CJabberProto::OnIqResult_CommandExecution ); dat->proto->m_ThreadInfo->send( XmlNodeIq( _T("set"), iqId, pStartupParams->m_szJid ) - << XCHILDNS( _T("command"), _T(JABBER_FEAT_COMMANDS)) + << XCHILDNS( _T("command"), _T(JABBER_FEAT_COMMANDS)) << XATTR( _T("node"), pStartupParams->m_szNode ) << XATTR( _T("action"), _T("execute"))); EnableDlgItem( hwndDlg, IDC_SUBMIT, FALSE ); @@ -447,8 +443,8 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc( HWND hwndDlg, UINT msg, WPAR return NULL; } case WM_COMMAND: - { - switch ( LOWORD( wParam )) + { + switch ( LOWORD( wParam )) { case IDC_PREV: @@ -458,7 +454,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc( HWND hwndDlg, UINT msg, WPAR case IDC_COMPLETE: return dat->proto->AdHoc_SubmitCommandForm(hwndDlg,dat,_T("complete")); case IDC_SUBMIT: - if (!dat->AdHocNode && dat->CommandsNode && LOWORD( wParam )==IDC_SUBMIT) + if (!dat->AdHocNode && dat->CommandsNode && LOWORD( wParam )==IDC_SUBMIT) return dat->proto->AdHoc_ExecuteCommand(hwndDlg,dat->ResponderJID, dat); else return dat->proto->AdHoc_SubmitCommandForm(hwndDlg,dat, NULL); @@ -551,7 +547,7 @@ int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam ) DBVARIANT dbv; int res = -1; JABBER_LIST_ITEM * item=NULL; - + if ((( hContact=( HANDLE ) wParam )!=NULL || (lParam!=0)) && m_bJabberOnline ) { if ( wParam && !JGetStringT( hContact, "jid", &dbv )) { TCHAR jid[ JABBER_MAX_JID_LEN ]; @@ -579,7 +575,7 @@ int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam ) } else selected=1; - if (selected>0) + if (selected>0) { selected--; if (item->resource) @@ -598,7 +594,7 @@ int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam ) CreateDialogParam( hInst, MAKEINTRESOURCE( IDD_FORM ), NULL, JabberAdHoc_CommandDlgProc, ( LPARAM )(pStartupParams)); } JFreeVariant( &dbv ); - + } else if (lParam!=0) CreateDialogParam( hInst, MAKEINTRESOURCE( IDD_FORM ), NULL, JabberAdHoc_CommandDlgProc, lParam ); diff --git a/protocols/JabberG/jabber_agent.cpp b/protocols/JabberG/jabber_agent.cpp index 144527430f..b0ad17e8a0 100644 --- a/protocols/JabberG/jabber_agent.cpp +++ b/protocols/JabberG/jabber_agent.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13618 $ -Last change on : $Date: 2011-04-22 17:09:42 +0300 (Пт, 22 апр 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_bookmarks.cpp b/protocols/JabberG/jabber_bookmarks.cpp index 096b8bf55f..f3923e04de 100644 --- a/protocols/JabberG/jabber_bookmarks.cpp +++ b/protocols/JabberG/jabber_bookmarks.cpp @@ -17,10 +17,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: 13205 $ -Last change on : $Date: 2010-12-20 07:26:05 +0200 (Пн, 20 дек 2010) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_byte.cpp b/protocols/JabberG/jabber_byte.cpp index aa030aa7e8..2126aab373 100644 --- a/protocols/JabberG/jabber_byte.cpp +++ b/protocols/JabberG/jabber_byte.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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_byte.h b/protocols/JabberG/jabber_byte.h index d8f2dce3ad..657d797fce 100644 --- a/protocols/JabberG/jabber_byte.h +++ b/protocols/JabberG/jabber_byte.h @@ -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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_BYTE_H_ diff --git a/protocols/JabberG/jabber_caps.cpp b/protocols/JabberG/jabber_caps.cpp index 00f2a2bc68..9eb652498d 100644 --- a/protocols/JabberG/jabber_caps.cpp +++ b/protocols/JabberG/jabber_caps.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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_caps.h b/protocols/JabberG/jabber_caps.h index 004355cc3c..8fb38030e1 100644 --- a/protocols/JabberG/jabber_caps.h +++ b/protocols/JabberG/jabber_caps.h @@ -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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #ifndef _JABBER_CAPS_H_ diff --git a/protocols/JabberG/jabber_captcha.cpp b/protocols/JabberG/jabber_captcha.cpp index 5808cd285c..641538d190 100644 --- a/protocols/JabberG/jabber_captcha.cpp +++ b/protocols/JabberG/jabber_captcha.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: 13444 $ -Last change on : $Date: 2011-03-13 23:44:13 +0300 (Вс, 13 мар 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_chat.cpp b/protocols/JabberG/jabber_chat.cpp index ac17a992b1..60dc011faa 100644 --- a/protocols/JabberG/jabber_chat.cpp +++ b/protocols/JabberG/jabber_chat.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" @@ -376,6 +372,11 @@ void CJabberProto::GcQuit( JABBER_LIST_ITEM* item, int code, HXML reason ) if ( reason != NULL && xmlGetText( reason ) != NULL ) szReason = xmlGetText( reason ); + if (m_options.GcLogChatHistory) { + HANDLE hContact = ChatRoomHContactFromJID(item->jid); + JSetDword(hContact, "muc_lastevent", time(NULL)); + } + GCDEST gcd = { m_szModuleName, NULL, GC_EVENT_CONTROL }; gcd.ptszID = item->jid; GCEVENT gce = {0}; @@ -681,7 +682,8 @@ int CJabberProto::JabberGcMenuHook( WPARAM, LPARAM lParam ) sttSetupGcMenuItem(gcmi, 0, TRUE); gcmi->Item[2].uType = 0; sttShowGcMenuItems(gcmi, sttRJidItems, 0); - } } + } + } return 0; } diff --git a/protocols/JabberG/jabber_console.cpp b/protocols/JabberG/jabber_console.cpp index 4214e67563..ca2c82b3e4 100644 --- a/protocols/JabberG/jabber_console.cpp +++ b/protocols/JabberG/jabber_console.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 Copyright ( C ) 2007 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_db_utils.h b/protocols/JabberG/jabber_db_utils.h index 3670bfaeb5..f8196567a1 100644 --- a/protocols/JabberG/jabber_db_utils.h +++ b/protocols/JabberG/jabber_db_utils.h @@ -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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 8244 $ -Last change on : $Date: 2008-09-17 15:09:42 +0300 (, 17 C 2008) $ -Last change by : $Author: vpavlychko $ - */ #ifndef __jabber_db_utils_h__ diff --git a/protocols/JabberG/jabber_disco.cpp b/protocols/JabberG/jabber_disco.cpp index e44f3613f9..eadfd2d5d1 100644 --- a/protocols/JabberG/jabber_disco.cpp +++ b/protocols/JabberG/jabber_disco.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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_disco.h b/protocols/JabberG/jabber_disco.h index 3c34dfab5f..583bc61f4c 100644 --- a/protocols/JabberG/jabber_disco.h +++ b/protocols/JabberG/jabber_disco.h @@ -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 ) 2005-07 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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_DISCO_H_ diff --git a/protocols/JabberG/jabber_events.cpp b/protocols/JabberG/jabber_events.cpp index 591bff3c96..87a4aa4e7a 100644 --- a/protocols/JabberG/jabber_events.cpp +++ b/protocols/JabberG/jabber_events.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: 13665 $ -Last change on : $Date: 2011-07-03 05:29:28 +0300 (Вс, 03 июл 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_file.cpp b/protocols/JabberG/jabber_file.cpp index 3cce546bef..716e108caf 100644 --- a/protocols/JabberG/jabber_file.cpp +++ b/protocols/JabberG/jabber_file.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_form.cpp b/protocols/JabberG/jabber_form.cpp index 797001e630..a90dcf62fa 100644 --- a/protocols/JabberG/jabber_form.cpp +++ b/protocols/JabberG/jabber_form.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13618 $ -Last change on : $Date: 2011-04-22 17:09:42 +0300 (Пт, 22 апр 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_form2.cpp b/protocols/JabberG/jabber_form2.cpp index c7cc39d2c6..5a97ab6827 100644 --- a/protocols/JabberG/jabber_form2.cpp +++ b/protocols/JabberG/jabber_form2.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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_form2.h b/protocols/JabberG/jabber_form2.h index 0ecfb4fdfd..051eb8571f 100644 --- a/protocols/JabberG/jabber_form2.h +++ b/protocols/JabberG/jabber_form2.h @@ -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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ enum TJabberDataFormType diff --git a/protocols/JabberG/jabber_ft.cpp b/protocols/JabberG/jabber_ft.cpp index dda0a69455..ac011392f6 100644 --- a/protocols/JabberG/jabber_ft.cpp +++ b/protocols/JabberG/jabber_ft.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: 13512 $ -Last change on : $Date: 2011-03-27 00:50:25 +0200 (Вс, 27 мар 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_groupchat.cpp b/protocols/JabberG/jabber_groupchat.cpp index 8fef909be5..9bacd42ca2 100644 --- a/protocols/JabberG/jabber_groupchat.cpp +++ b/protocols/JabberG/jabber_groupchat.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" @@ -307,10 +303,10 @@ void CJabberProto::GroupchatJoinRoom( const TCHAR* server, const TCHAR* room, co info.saveRecent(0); } - TCHAR text[512]; - mir_sntprintf( text, SIZEOF(text), _T("%s@%s/%s"), room, server, nick ); + TCHAR jid[512]; + mir_sntprintf( jid, SIZEOF(jid), _T("%s@%s/%s"), room, server, nick ); - JABBER_LIST_ITEM* item = ListAdd( LIST_CHATROOM, text ); + JABBER_LIST_ITEM* item = ListAdd( LIST_CHATROOM, jid ); item->bAutoJoin = autojoin; replaceStr( item->nick, nick ); replaceStr( item->password, info.password ); @@ -321,21 +317,16 @@ void CJabberProto::GroupchatJoinRoom( const TCHAR* server, const TCHAR* room, co x << XCHILD( _T("password"), info.password ); if (m_options.GcLogChatHistory) { - char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "muc_%s@%s_lastevent", _T2A(room), _T2A(server)); - time_t lasteventtime = this->JGetDword( NULL, setting, 0 ); - if ( lasteventtime > 0 ) { - _tzset(); - lasteventtime += _timezone + 1; - struct tm* time = localtime(&lasteventtime); + HANDLE hContact = ChatRoomHContactFromJID(jid); + time_t lasteventtime = JGetDword(hContact, "muc_lastevent", 0); + if (hContact && lasteventtime) { TCHAR lasteventdate[40]; - mir_sntprintf(lasteventdate, SIZEOF(lasteventdate), _T("%04d-%02d-%02dT%02d:%02d:%02dZ"), - time->tm_year+1900, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec); + tmi.printTimeStamp(UTC_TIME_HANDLE, lasteventtime, _T("I"), lasteventdate, SIZEOF(lasteventdate), 0); x << XCHILD( _T("history")) << XATTR( _T("since"), lasteventdate); } } - SendPresenceTo( status, text, x ); + SendPresenceTo( status, jid, x ); } //////////////////////////////////////////////////////////////////////////////// @@ -1245,17 +1236,8 @@ void CJabberProto::GroupchatProcessMessage( HXML node ) for ( int i = 1; ( xNode = xmlGetNthChild( node, _T("x"), i )) != NULL; i++ ) if (( p = xmlGetAttrValue( xNode, _T("xmlns"))) != NULL ) if ( !_tcscmp( p, _T("jabber:x:delay")) && msgTime==0 ) - if (( p = xmlGetAttrValue( xNode, _T("stamp"))) != NULL ) { + if (( p = xmlGetAttrValue( xNode, _T("stamp"))) != NULL ) msgTime = JabberIsoToUnixTime( p ); - if (m_options.GcLogChatHistory && msgTime > 0 ) { - char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, sizeof(setting), "muc_%s_lastevent", _T2A(gcd.ptszID)); - this->JSetDword(NULL, setting, msgTime); - } } - - time_t now = time( NULL ); - if ( msgTime == 0 || msgTime > now ) - msgTime = now; if ( resource != NULL ) { JABBER_RESOURCE_STATUS* r = GcFindResource(item, resource); @@ -1264,6 +1246,10 @@ void CJabberProto::GroupchatProcessMessage( HXML node ) else nick = NULL; + time_t now = time( NULL ); + if ( msgTime == 0 || msgTime > now ) + msgTime = now; + GCEVENT gce = {0}; gce.cbSize = sizeof(GCEVENT); gce.pDest = &gcd; diff --git a/protocols/JabberG/jabber_ibb.cpp b/protocols/JabberG/jabber_ibb.cpp index fddd60c20f..51719a696b 100644 --- a/protocols/JabberG/jabber_ibb.cpp +++ b/protocols/JabberG/jabber_ibb.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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_ibb.h b/protocols/JabberG/jabber_ibb.h index 635126d68a..37ecfd1a2e 100644 --- a/protocols/JabberG/jabber_ibb.h +++ b/protocols/JabberG/jabber_ibb.h @@ -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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_IBB_H_ diff --git a/protocols/JabberG/jabber_icolib.cpp b/protocols/JabberG/jabber_icolib.cpp index 12c9387ced..029a4be6c9 100644 --- a/protocols/JabberG/jabber_icolib.cpp +++ b/protocols/JabberG/jabber_icolib.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 Idea & portions of code by Artem Shpynov @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2006-07-13 16:11:29 +0400 -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_icolib.h b/protocols/JabberG/jabber_icolib.h index ff8e6222ab..4b5f7d8e12 100644 --- a/protocols/JabberG/jabber_icolib.h +++ b/protocols/JabberG/jabber_icolib.h @@ -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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_ICOLIB_H_ diff --git a/protocols/JabberG/jabber_iq.cpp b/protocols/JabberG/jabber_iq.cpp index 4f5a0cd049..43084114c2 100644 --- a/protocols/JabberG/jabber_iq.cpp +++ b/protocols/JabberG/jabber_iq.cpp @@ -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: 14134 $ -Last change on : $Date: 2012-03-08 04:11:39 +0200 (Чт, 08 мар 2012) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_iq.h b/protocols/JabberG/jabber_iq.h index 15ed360d86..85da7e5195 100644 --- a/protocols/JabberG/jabber_iq.h +++ b/protocols/JabberG/jabber_iq.h @@ -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: 13870 $ -Last change on : $Date: 2011-09-16 16:30:27 +0300 (Пт, 16 сен 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_IQ_H_ diff --git a/protocols/JabberG/jabber_iq_handlers.cpp b/protocols/JabberG/jabber_iq_handlers.cpp index eb54b8fc6d..4a77b5847d 100644 --- a/protocols/JabberG/jabber_iq_handlers.cpp +++ b/protocols/JabberG/jabber_iq_handlers.cpp @@ -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: 14134 $ -Last change on : $Date: 2012-03-08 04:11:39 +0200 (Чт, 08 мар 2012) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_iqid.cpp b/protocols/JabberG/jabber_iqid.cpp index 06939c21bf..e90fdfcbc6 100644 --- a/protocols/JabberG/jabber_iqid.cpp +++ b/protocols/JabberG/jabber_iqid.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: 14151 $ -Last change on : $Date: 2012-03-10 18:44:03 +0200 (Сб, 10 мар 2012) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_iqid_muc.cpp b/protocols/JabberG/jabber_iqid_muc.cpp index 641988d280..3621506d29 100644 --- a/protocols/JabberG/jabber_iqid_muc.cpp +++ b/protocols/JabberG/jabber_iqid_muc.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_libstr.cpp b/protocols/JabberG/jabber_libstr.cpp index 955e949d1e..b628c88348 100644 --- a/protocols/JabberG/jabber_libstr.cpp +++ b/protocols/JabberG/jabber_libstr.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_list.cpp b/protocols/JabberG/jabber_list.cpp index 155f9e2b60..0bf29fe45d 100644 --- a/protocols/JabberG/jabber_list.cpp +++ b/protocols/JabberG/jabber_list.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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" @@ -153,15 +149,10 @@ JABBER_LIST_ITEM *CJabberProto::ListAdd( JABBER_LIST list, const TCHAR* jid ) bUseResource=TRUE; } } - item = ( JABBER_LIST_ITEM* )mir_alloc( sizeof( JABBER_LIST_ITEM )); - ZeroMemory( item, sizeof( JABBER_LIST_ITEM )); + item = ( JABBER_LIST_ITEM* )mir_calloc( sizeof( JABBER_LIST_ITEM )); item->list = list; item->jid = s; item->itemResource.status = ID_STATUS_OFFLINE; - item->resource = NULL; - item->resourceMode = RSMODE_LASTSEEN; - item->lastSeenResource = -1; - item->manualResource = -1; item->bUseResource = bUseResource; m_lstRoster.insert( item ); @@ -309,19 +300,15 @@ void CJabberProto::ListRemoveResource( JABBER_LIST list, const TCHAR* jid ) } if ( j < LI->resourceCount ) { // Found last seen resource ID to be removed - if ( LI->lastSeenResource == j ) - LI->lastSeenResource = -1; - else if ( LI->lastSeenResource > j ) - LI->lastSeenResource--; + if ( LI->lastSeenResource == r ) + LI->lastSeenResource = NULL; + // update manually selected resource ID - if (LI->resourceMode == RSMODE_MANUAL) - { - if ( LI->manualResource == j ) - { - LI->resourceMode = RSMODE_LASTSEEN; - LI->manualResource = -1; - } else if ( LI->manualResource > j ) - LI->manualResource--; + if (LI->resourceMode == RSMODE_MANUAL) { + if ( LI->manualResource == r ) { + LI->resourceMode = RSMODE_SERVER; + LI->manualResource = NULL; + } } // Update MirVer due to possible resource changes @@ -356,26 +343,20 @@ TCHAR* CJabberProto::ListGetBestResourceNamePtr( const TCHAR* jid ) JABBER_LIST_ITEM* LI = m_lstRoster[i-1]; if ( LI->resourceCount > 1 ) { - if ( LI->resourceMode == RSMODE_LASTSEEN && LI->lastSeenResource>=0 && LI->lastSeenResource < LI->resourceCount ) - res = LI->resource[ LI->lastSeenResource ].resourceName; - else if (LI->resourceMode == RSMODE_MANUAL && LI->manualResource>=0 && LI->manualResource < LI->resourceCount ) - res = LI->resource[ LI->manualResource ].resourceName; + if (LI->resourceMode == RSMODE_MANUAL && LI->manualResource ) + res = LI->manualResource->resourceName; else { - int nBestPos = -1, nBestPri = -200, j; - for ( j = 0; j < LI->resourceCount; j++ ) { - if ( LI->resource[ j ].priority > nBestPri ) { - nBestPri = LI->resource[ j ].priority; - nBestPos = j; + for ( int j = 0; j < LI->resourceCount; j++ ) { + if ( LI->resource[ j ].uMessageSessionActive + 120 > time( NULL )) { + res = LI->resource[ j ].resourceName; + break; } + else + LI->resource[ j ].uMessageSessionActive = 0; } - if ( nBestPos != -1 ) - res = LI->resource[ nBestPos ].resourceName; } } - if ( !res && LI->resource) - res = LI->resource[0].resourceName; - LeaveCriticalSection( &m_csLists ); return res; } diff --git a/protocols/JabberG/jabber_list.h b/protocols/JabberG/jabber_list.h index bd14a52fd3..c2ee0409e8 100644 --- a/protocols/JabberG/jabber_list.h +++ b/protocols/JabberG/jabber_list.h @@ -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: 13833 $ -Last change on : $Date: 2011-09-04 19:48:36 +0300 (Вс, 04 сен 2011) $ -Last change by : $Author: borkra $ - */ #ifndef _JABBER_LIST_H_ @@ -64,9 +60,8 @@ typedef enum { ROLE_MODERATOR } JABBER_GC_ROLE; -typedef enum { // initial default to RSMODE_LASTSEEN +typedef enum { // initial default to RSMODE_SERVER RSMODE_SERVER, // always let server decide ( always send correspondence without resouce name ) - RSMODE_LASTSEEN, // use the last seen resource ( or let server decide if haven't seen anything yet ) RSMODE_MANUAL // specify resource manually ( see the defaultResource field - must not be NULL ) } JABBER_RESOURCE_MODE; @@ -118,7 +113,7 @@ struct JABBER_RESOURCE_STATUS JabberCapsBits jcbManualDiscoveredCaps; // XEP-0085 gone event support - BOOL bMessageSessionActive; + BOOL uMessageSessionActive; JABBER_XEP0232_SOFTWARE_INFO* pSoftwareInfo; }; @@ -133,8 +128,8 @@ struct JABBER_LIST_ITEM int resourceCount; JABBER_RESOURCE_STATUS *resource; JABBER_RESOURCE_STATUS itemResource; // resource for jids without /resource node - int lastSeenResource; // index to resource[x] which was last seen active - int manualResource; // manually set index to resource[x] + JABBER_RESOURCE_STATUS *lastSeenResource; // index to resource[x] which was last seen active + JABBER_RESOURCE_STATUS *manualResource; // manually set index to resource[x] // int defaultResource; // index to resource[x] which is the default, negative ( -1 ) means no resource is chosen yet JABBER_RESOURCE_MODE resourceMode; JABBER_SUBSCRIPTION subscription; @@ -161,7 +156,7 @@ struct JABBER_LIST_ITEM HWND hwndGcListAdmin; HWND hwndGcListOwner; int iChatState; - // BOOL bAutoJoin; // chat sessio was started via auto-join + // BOOL bAutoJoin; // chat session was started via auto-join // LIST_FILE // jid = string representation of port number diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/jabber_menu.cpp index e0c99757b3..1bc4007148 100644 --- a/protocols/JabberG/jabber_menu.cpp +++ b/protocols/JabberG/jabber_menu.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: 13905 $ -Last change on : $Date: 2011-11-06 01:31:18 +0200 (Вс, 06 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" @@ -38,7 +34,6 @@ Last change by : $Author: borkra $ #include "m_toolbar.h" -#define MENUITEM_LASTSEEN 1 #define MENUITEM_SERVER 2 #define MENUITEM_RESOURCES 10 @@ -59,7 +54,6 @@ static HGENMENU g_hMenuRefresh; static HGENMENU g_hMenuCommands; static HGENMENU g_hMenuSendNote; static HGENMENU g_hMenuResourcesRoot; -static HGENMENU g_hMenuResourcesActive; static HGENMENU g_hMenuResourcesServer; static struct @@ -342,20 +336,12 @@ void g_MenuInit( void ) mi.icolibItem = g_GetIconHandle( IDI_JABBER ); g_hMenuResourcesRoot = Menu_AddContactMenuItem(&mi); - mi.pszService = "Jabber/UseResource_last"; - mi.pszName = LPGEN("Last Active"); - mi.position = -1999901000; - mi.hParentMenu = g_hMenuResourcesRoot; - mi.icolibItem = g_GetIconHandle( IDI_JABBER ); - mi.flags |= CMIF_ROOTHANDLE; - g_hMenuResourcesActive = Menu_AddContactMenuItem(&mi); - List_InsertPtr( &arServices, CreateServiceFunctionParam( mi.pszService, JabberMenuHandleResource, MENUITEM_LASTSEEN )); - mi.pszService = "Jabber/UseResource_server"; mi.pszName = LPGEN("Server's Choice"); mi.position = -1999901000; - mi.pszPopupName = (char *)g_hMenuResourcesRoot; + mi.hParentMenu = g_hMenuResourcesRoot; mi.icolibItem = g_GetIconHandle( IDI_NODE_SERVER ); + mi.flags |= CMIF_ROOTHANDLE; g_hMenuResourcesServer = Menu_AddContactMenuItem(&mi); List_InsertPtr( &arServices, CreateServiceFunctionParam( mi.pszService, JabberMenuHandleResource, MENUITEM_SERVER )); } @@ -455,7 +441,6 @@ int CJabberProto::OnPrebuildContactMenu( WPARAM wParam, LPARAM ) mi.flags = CMIM_ICON|CMIM_FLAGS; mi.icolibItem = GetIconHandle( IDI_JABBER ); CallService(MS_CLIST_MODIFYMENUITEM, ( WPARAM )g_hMenuResourcesRoot, ( LPARAM )&mi ); - CallService(MS_CLIST_MODIFYMENUITEM, ( WPARAM )g_hMenuResourcesActive, ( LPARAM )&mi ); int nMenuResourceItemsNew = m_nMenuResourceItems; if ( m_nMenuResourceItems < item->resourceCount ) { @@ -489,7 +474,7 @@ int CJabberProto::OnPrebuildContactMenu( WPARAM wParam, LPARAM ) CLISTMENUITEM clmi = {0}; clmi.cbSize = sizeof(CLISTMENUITEM); clmi.flags = CMIM_NAME|CMIM_FLAGS | CMIF_CHILDPOPUP|CMIF_TCHAR; - if ((item->resourceMode == RSMODE_MANUAL) && (item->manualResource == i)) + if ((item->resourceMode == RSMODE_MANUAL) && (item->manualResource == &item->resource[i])) clmi.flags |= CMIF_CHECKED; if (ServiceExists( "Fingerprint/GetClientIcon" )) { clmi.flags |= CMIM_ICON; @@ -512,10 +497,6 @@ int CJabberProto::OnPrebuildContactMenu( WPARAM wParam, LPARAM ) ZeroMemory(&mi, sizeof(mi)); mi.cbSize = sizeof(CLISTMENUITEM); - mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP|CMIF_ICONFROMICOLIB | - ((item->resourceMode == RSMODE_LASTSEEN) ? CMIF_CHECKED : 0); - CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )g_hMenuResourcesActive, ( LPARAM )&mi ); - mi.flags = CMIM_FLAGS | CMIF_CHILDPOPUP|CMIF_ICONFROMICOLIB | ((item->resourceMode == RSMODE_SERVER) ? CMIF_CHECKED : 0); CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )g_hMenuResourcesServer, ( LPARAM )&mi ); @@ -1126,8 +1107,8 @@ int CJabberProto::OnProcessSrmmEvent( WPARAM, LPARAM lParam ) JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID( jid ); - if ( r && r->bMessageSessionActive ) { - r->bMessageSessionActive = FALSE; + if ( r && r->uMessageSessionActive ) { + r->uMessageSessionActive = 0; JabberCapsBits jcb = GetResourceCapabilites( jid, TRUE ); if ( jcb & JABBER_CAPS_CHATSTATES ) { @@ -1164,35 +1145,35 @@ int CJabberProto::OnProcessSrmmIconClick( WPARAM wParam, LPARAM lParam ) TCHAR buf[256]; mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), TranslateT("Last active"), - ((LI->lastSeenResource>=0) && (LI->lastSeenResource < LI->resourceCount)) ? - LI->resource[LI->lastSeenResource].resourceName : TranslateT("No activity yet, use server's choice")); - AppendMenu(hMenu, MF_STRING, MENUITEM_LASTSEEN, buf); + LI->lastSeenResource ? LI->lastSeenResource->resourceName : + TranslateT("No activity yet, use server's choice")); - AppendMenu(hMenu, MF_STRING, MENUITEM_SERVER, TranslateT("Highest priority (server's choice)")); + AppendMenu(hMenu, MF_STRING, MENUITEM_SERVER, TranslateT("Standard")); AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); - for (int i = 0; i < LI->resourceCount; ++i) + int manInd = -1; + for (int i = 0; i < LI->resourceCount; ++i) { AppendMenu(hMenu, MF_STRING, MENUITEM_RESOURCES+i, LI->resource[i].resourceName); + if (&LI->resource[i] == LI->manualResource) + manInd = i; + } - if (LI->resourceMode == RSMODE_LASTSEEN) - CheckMenuItem(hMenu, MENUITEM_LASTSEEN, MF_BYCOMMAND|MF_CHECKED); - else if (LI->resourceMode == RSMODE_SERVER) - CheckMenuItem(hMenu, MENUITEM_SERVER, MF_BYCOMMAND|MF_CHECKED); + if (LI->resourceMode == RSMODE_MANUAL) + CheckMenuItem(hMenu, MENUITEM_RESOURCES + manInd, MF_BYCOMMAND|MF_CHECKED); else - CheckMenuItem(hMenu, MENUITEM_RESOURCES+LI->manualResource, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(hMenu, MENUITEM_SERVER, MF_BYCOMMAND|MF_CHECKED); int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, sicd->clickLocation.x, sicd->clickLocation.y, 0, WindowList_Find(hDialogsList, hContact), NULL); - if ( res == MENUITEM_LASTSEEN ) { - LI->manualResource = -1; - LI->resourceMode = RSMODE_LASTSEEN; - } - else if (res == MENUITEM_SERVER) { - LI->manualResource = -1; + if (res == MENUITEM_SERVER) { + LI->manualResource = NULL; LI->resourceMode = RSMODE_SERVER; + + for ( int i=0; iresourceCount; i++ ) + LI->resource[i].uMessageSessionActive = 0; } else if (res >= MENUITEM_RESOURCES) { - LI->manualResource = res - MENUITEM_RESOURCES; + LI->manualResource = &LI->resource[res - MENUITEM_RESOURCES]; LI->resourceMode = RSMODE_MANUAL; } @@ -1219,16 +1200,15 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleResource(WPARAM wParam, LPARAM, LPARAM if ( !LI ) return 0; - if ( res == MENUITEM_LASTSEEN ) { - LI->manualResource = -1; - LI->resourceMode = RSMODE_LASTSEEN; - } - else if (res == MENUITEM_SERVER) { - LI->manualResource = -1; + if (res == MENUITEM_SERVER) { + LI->manualResource = NULL; LI->resourceMode = RSMODE_SERVER; + + for ( int i=0; iresourceCount; i++ ) + LI->resource[i].uMessageSessionActive = 0; } else if (res >= MENUITEM_RESOURCES) { - LI->manualResource = res - MENUITEM_RESOURCES; + LI->manualResource = &LI->resource[res - MENUITEM_RESOURCES]; LI->resourceMode = RSMODE_MANUAL; } diff --git a/protocols/JabberG/jabber_message_handlers.cpp b/protocols/JabberG/jabber_message_handlers.cpp index d17e2b131d..a3801f274f 100644 --- a/protocols/JabberG/jabber_message_handlers.cpp +++ b/protocols/JabberG/jabber_message_handlers.cpp @@ -20,10 +20,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: 7392 $ -Last change on : $Date: 2008-03-04 23:50:26 +0200 $ -Last change by : $Author: dchervov $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_message_manager.cpp b/protocols/JabberG/jabber_message_manager.cpp index b27c59e171..67e9982eb3 100644 --- a/protocols/JabberG/jabber_message_manager.cpp +++ b/protocols/JabberG/jabber_message_manager.cpp @@ -20,10 +20,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: 7543 $ -Last change on : $Date: 2008-03-30 22:55:23 +0300 (, 30 2008) $ -Last change by : $Author: dchervov $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_message_manager.h b/protocols/JabberG/jabber_message_manager.h index 342f88a91d..5265056bca 100644 --- a/protocols/JabberG/jabber_message_manager.h +++ b/protocols/JabberG/jabber_message_manager.h @@ -20,10 +20,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: 7173 $ -Last change on : $Date: 2008-01-28 15:32:35 +0200 $ -Last change by : $Author: dchervov $ - */ #ifndef _JABBER_MESSAGE_MANAGER_H_ diff --git a/protocols/JabberG/jabber_misc.cpp b/protocols/JabberG/jabber_misc.cpp index 09e5d8f0ee..1faeaaadda 100644 --- a/protocols/JabberG/jabber_misc.cpp +++ b/protocols/JabberG/jabber_misc.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: 13898 $ -Last change on : $Date: 2006-07-13 16:11:29 +0400 -Last change by : $Author: borkra $ - */ #include "jabber.h" @@ -471,15 +467,10 @@ void CJabberProto::UpdateMirVer(JABBER_LIST_ITEM *item) Log("JabberUpdateMirVer: for jid " TCHAR_STR_PARAM, item->jid); - int resource = -1; - if (item->resourceMode == RSMODE_LASTSEEN) - resource = item->lastSeenResource; - else if (item->resourceMode == RSMODE_MANUAL) - resource = item->manualResource; - if ((resource < 0) || (resource >= item->resourceCount)) - return; + JABBER_RESOURCE_STATUS *resource = item->resourceMode == RSMODE_MANUAL ? item->manualResource : item->lastSeenResource; + if (resource == NULL) resource = &item->resource[0]; - UpdateMirVer( hContact, &item->resource[resource] ); + UpdateMirVer( hContact, resource ); } void CJabberProto::FormatMirVer(JABBER_RESOURCE_STATUS *resource, TCHAR *buf, int bufSize) diff --git a/protocols/JabberG/jabber_notes.cpp b/protocols/JabberG/jabber_notes.cpp index 4e40f25c7c..d684541f0a 100644 --- a/protocols/JabberG/jabber_notes.cpp +++ b/protocols/JabberG/jabber_notes.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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_notes.h b/protocols/JabberG/jabber_notes.h index 5552c15be9..de096943c2 100644 --- a/protocols/JabberG/jabber_notes.h +++ b/protocols/JabberG/jabber_notes.h @@ -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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef __jabber_notes_h__ diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/jabber_opt.cpp index 588e3a9e4b..a922603b04 100644 --- a/protocols/JabberG/jabber_opt.cpp +++ b/protocols/JabberG/jabber_opt.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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_opttree.cpp b/protocols/JabberG/jabber_opttree.cpp index 34fc0c45f2..bd43b55a08 100644 --- a/protocols/JabberG/jabber_opttree.cpp +++ b/protocols/JabberG/jabber_opttree.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 Copyright ( C ) 2007 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_opttree.h b/protocols/JabberG/jabber_opttree.h index 83814f1076..3246ad74a3 100644 --- a/protocols/JabberG/jabber_opttree.h +++ b/protocols/JabberG/jabber_opttree.h @@ -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 Copyright ( C ) 2007 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef __jabber_opttree_h__ diff --git a/protocols/JabberG/jabber_password.cpp b/protocols/JabberG/jabber_password.cpp index dd5ae36266..2ce5128b78 100644 --- a/protocols/JabberG/jabber_password.cpp +++ b/protocols/JabberG/jabber_password.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_presence_manager.cpp b/protocols/JabberG/jabber_presence_manager.cpp index d8bbed6149..8a8ece811d 100644 --- a/protocols/JabberG/jabber_presence_manager.cpp +++ b/protocols/JabberG/jabber_presence_manager.cpp @@ -20,10 +20,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: 7543 $ -Last change on : $Date: 2008-03-30 22:55:23 +0300 (, 30 2008) $ -Last change by : $Author: dchervov $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_presence_manager.h b/protocols/JabberG/jabber_presence_manager.h index 412a29ad3b..be138d3b93 100644 --- a/protocols/JabberG/jabber_presence_manager.h +++ b/protocols/JabberG/jabber_presence_manager.h @@ -20,10 +20,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: 7173 $ -Last change on : $Date: 2008-01-28 15:32:35 +0200 $ -Last change by : $Author: dchervov $ - */ #ifndef _JABBER_PRESENCE_MANAGER_H_ diff --git a/protocols/JabberG/jabber_privacy.cpp b/protocols/JabberG/jabber_privacy.cpp index 1b9196943b..7d9258c021 100644 --- a/protocols/JabberG/jabber_privacy.cpp +++ b/protocols/JabberG/jabber_privacy.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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13869 $ -Last change on : $Date: 2011-09-16 01:42:09 +0300 (Пт, 16 сен 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_privacy.h b/protocols/JabberG/jabber_privacy.h index 7eda283a94..a6fe82e725 100644 --- a/protocols/JabberG/jabber_privacy.h +++ b/protocols/JabberG/jabber_privacy.h @@ -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: 13869 $ -Last change on : $Date: 2011-09-16 01:42:09 +0300 (Пт, 16 сен 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_PRIVACY_H_ 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 ) diff --git a/protocols/JabberG/jabber_proto.h b/protocols/JabberG/jabber_proto.h index 663c1d3ecd..a2a2baa8b8 100644 --- a/protocols/JabberG/jabber_proto.h +++ b/protocols/JabberG/jabber_proto.h @@ -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: 6992 $ -Last change on : $Date: 2007-12-29 03:47:51 +0300 (Сб, 29 дек 2007) $ -Last change by : $Author: m_mluhov $ - */ #ifndef _JABBER_PROTO_H_ diff --git a/protocols/JabberG/jabber_proxy.cpp b/protocols/JabberG/jabber_proxy.cpp index c00b0b734c..0741dcd53e 100644 --- a/protocols/JabberG/jabber_proxy.cpp +++ b/protocols/JabberG/jabber_proxy.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_proxy.h b/protocols/JabberG/jabber_proxy.h index 083e6e076e..a42591f81e 100644 --- a/protocols/JabberG/jabber_proxy.h +++ b/protocols/JabberG/jabber_proxy.h @@ -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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_PROXY_H_ diff --git a/protocols/JabberG/jabber_rc.cpp b/protocols/JabberG/jabber_rc.cpp index 312db4bac4..789b3eef74 100644 --- a/protocols/JabberG/jabber_rc.cpp +++ b/protocols/JabberG/jabber_rc.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 XEP-0146 support for Miranda IM @@ -21,10 +21,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_rc.h b/protocols/JabberG/jabber_rc.h index a83db38ab4..763743a28e 100644 --- a/protocols/JabberG/jabber_rc.h +++ b/protocols/JabberG/jabber_rc.h @@ -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 XEP-0146 support for Miranda IM @@ -21,10 +21,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_RC_H_ diff --git a/protocols/JabberG/jabber_search.cpp b/protocols/JabberG/jabber_search.cpp index fddcc5617d..083b0bdb88 100644 --- a/protocols/JabberG/jabber_search.cpp +++ b/protocols/JabberG/jabber_search.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 Artem Shpynov Module implements a search according to XEP-0055: Jabber Search @@ -22,10 +22,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: 13618 $ -Last change on : $Date: 2011-04-22 17:09:42 +0300 (Пт, 22 апр 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_search.h b/protocols/JabberG/jabber_search.h index ca754e4238..7450b652d1 100644 --- a/protocols/JabberG/jabber_search.h +++ b/protocols/JabberG/jabber_search.h @@ -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 Artem Shpynov Module implements a search according to XEP-0055: Jabber Search @@ -22,10 +22,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ typedef struct _tagJabberSearchFieldsInfo diff --git a/protocols/JabberG/jabber_secur.cpp b/protocols/JabberG/jabber_secur.cpp index 2dc9c29e68..db928d74ee 100644 --- a/protocols/JabberG/jabber_secur.cpp +++ b/protocols/JabberG/jabber_secur.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13955 $ -Last change on : $Date: 2011-12-12 21:04:13 +0200 (Пн, 12 дек 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_secur.h b/protocols/JabberG/jabber_secur.h index a3ad6b71ac..0c3287b88d 100644 --- a/protocols/JabberG/jabber_secur.h +++ b/protocols/JabberG/jabber_secur.h @@ -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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13651 $ -Last change on : $Date: 2011-06-03 03:50:37 +0300 (Пт, 03 июн 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_send_manager.cpp b/protocols/JabberG/jabber_send_manager.cpp index 4655f2371b..b37b1d2f09 100644 --- a/protocols/JabberG/jabber_send_manager.cpp +++ b/protocols/JabberG/jabber_send_manager.cpp @@ -20,10 +20,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: 7543 $ -Last change on : $Date: 2008-03-30 22:55:23 +0300 (, 30 2008) $ -Last change by : $Author: dchervov $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_send_manager.h b/protocols/JabberG/jabber_send_manager.h index 38ff4c7d78..fe4916686f 100644 --- a/protocols/JabberG/jabber_send_manager.h +++ b/protocols/JabberG/jabber_send_manager.h @@ -20,10 +20,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: 7173 $ -Last change on : $Date: 2008-01-28 15:32:35 +0200 $ -Last change by : $Author: dchervov $ - */ #ifndef _JABBER_SEND_MANAGER_H_ diff --git a/protocols/JabberG/jabber_std.cpp b/protocols/JabberG/jabber_std.cpp index a480b82924..d9d1229e78 100644 --- a/protocols/JabberG/jabber_std.cpp +++ b/protocols/JabberG/jabber_std.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_svc.cpp b/protocols/JabberG/jabber_svc.cpp index 857876ee15..c20b92cfe6 100644 --- a/protocols/JabberG/jabber_svc.cpp +++ b/protocols/JabberG/jabber_svc.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: 14069 $ -Last change on : $Date: 2012-02-07 10:52:37 +0200 (Вт, 07 фев 2012) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_thread.cpp b/protocols/JabberG/jabber_thread.cpp index 4bd558b048..191516a9d7 100644 --- a/protocols/JabberG/jabber_thread.cpp +++ b/protocols/JabberG/jabber_thread.cpp @@ -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: 14176 $ -Last change on : $Date: 2012-03-11 16:05:02 +0200 (Вс, 11 мар 2012) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" @@ -1118,7 +1114,7 @@ HANDLE CJabberProto::CreateTemporaryContact( const TCHAR *szJid, JABBER_LIST_ITE void CJabberProto::OnProcessMessage( HXML node, ThreadData* info ) { HXML subjectNode, xNode, inviteNode, idNode, n; - LPCTSTR from, type, idStr, fromResource; + LPCTSTR from, type, idStr; HANDLE hContact; if ( !xmlGetName( node ) || _tcscmp( xmlGetName( node ), _T("message"))) @@ -1215,8 +1211,11 @@ void CJabberProto::OnProcessMessage( HXML node, ThreadData* info ) JCallService( MS_PROTO_CONTACTISTYPING, ( WPARAM )hContact, PROTOTYPE_CONTACTTYPING_OFF ); // chatstates inactive event - if ( hContact && xmlGetChildByTag( node, "inactive", "xmlns", _T( JABBER_FEAT_CHATSTATES ))) + if ( hContact && xmlGetChildByTag( node, "inactive", "xmlns", _T( JABBER_FEAT_CHATSTATES ))) { JCallService( MS_PROTO_CONTACTISTYPING, ( WPARAM )hContact, PROTOTYPE_CONTACTTYPING_OFF ); + if ( resourceStatus ) + resourceStatus->uMessageSessionActive = 0; + } // message receipts delivery notification if ( n = xmlGetChildByTag( node, "received", "xmlns", _T( JABBER_FEAT_MESSAGE_RECEIPTS ))) { @@ -1256,17 +1255,20 @@ void CJabberProto::OnProcessMessage( HXML node, ThreadData* info ) } // chatstates gone event - if ( hContact && xmlGetChildByTag( node, "gone", "xmlns", _T( JABBER_FEAT_CHATSTATES )) && m_options.LogChatstates ) { - DBEVENTINFO dbei; - BYTE bEventType = JABBER_DB_EVENT_CHATSTATES_GONE; // gone event - dbei.cbSize = sizeof(dbei); - dbei.pBlob = &bEventType; - dbei.cbBlob = 1; - dbei.eventType = JABBER_DB_EVENT_TYPE_CHATSTATES; - dbei.flags = DBEF_READ; - dbei.timestamp = time(NULL); - dbei.szModule = m_szModuleName; - CallService(MS_DB_EVENT_ADD, (WPARAM)hContact, (LPARAM)&dbei); + if ( hContact && xmlGetChildByTag( node, "gone", "xmlns", _T( JABBER_FEAT_CHATSTATES ))) { + if ( resourceStatus ) resourceStatus->uMessageSessionActive = 0; + if ( m_options.LogChatstates ) { + DBEVENTINFO dbei; + BYTE bEventType = JABBER_DB_EVENT_CHATSTATES_GONE; // gone event + dbei.cbSize = sizeof(dbei); + dbei.pBlob = &bEventType; + dbei.cbBlob = 1; + dbei.eventType = JABBER_DB_EVENT_TYPE_CHATSTATES; + dbei.flags = DBEF_READ; + dbei.timestamp = time(NULL); + dbei.szModule = m_szModuleName; + CallService(MS_DB_EVENT_ADD, (WPARAM)hContact, (LPARAM)&dbei); + } } if (( n = xmlGetChildByTag( node, "confirm", "xmlns", _T( JABBER_FEAT_HTTP_AUTH ))) && m_options.AcceptHttpAuth ) { @@ -1472,25 +1474,26 @@ void CJabberProto::OnProcessMessage( HXML node, ThreadData* info ) if (( szMessage = JabberUnixToDosT( szMessage )) == NULL ) szMessage = mir_tstrdup( _T("")); - char* buf = mir_utf8encodeW( szMessage ); + char* buf = mir_utf8encodeW(szMessage); if ( item != NULL ) { - if ( resourceStatus ) resourceStatus->bMessageSessionActive = TRUE; if ( hContact != NULL ) JCallService( MS_PROTO_CONTACTISTYPING, ( WPARAM ) hContact, PROTOTYPE_CONTACTTYPING_OFF ); - // no we will monitor last resource in all modes - if ( /*item->resourceMode==RSMODE_LASTSEEN &&*/ ( fromResource = _tcschr( from, '/' ))!=NULL ) { - fromResource++; - if ( *fromResource != '\0' ) { - for ( int i=0; iresourceCount; i++ ) { - if ( !lstrcmp( item->resource[i].resourceName, fromResource )) { - int nLastSeenResource = item->lastSeenResource; - item->lastSeenResource = i; - if ((item->resourceMode==RSMODE_LASTSEEN) && (i != nLastSeenResource)) - UpdateMirVer(item); - break; - } } } } } + if (item->resourceMode != RSMODE_MANUAL && resourceStatus != item->lastSeenResource) { + item->lastSeenResource = resourceStatus; + UpdateMirVer(item); + } + else item->lastSeenResource = resourceStatus; + + if ( resourceStatus && resourceStatus->uMessageSessionActive == 0 ) { + for ( int i=0; iresourceCount; i++ ) + if ( &item->resource[i] != resourceStatus ) + item->resource[i].uMessageSessionActive = 0; + } + if ( resourceStatus ) + resourceStatus->uMessageSessionActive = time(NULL); + } // Create a temporary contact if ( hContact == NULL ) @@ -1521,7 +1524,8 @@ void CJabberProto::OnProcessMessage( HXML node, ThreadData* info ) mir_free(( void* )szMessage ); mir_free( buf ); -} } + } +} // XEP-0115: Entity Capabilities void CJabberProto::OnProcessPresenceCapabilites( HXML node ) diff --git a/protocols/JabberG/jabber_treelist.cpp b/protocols/JabberG/jabber_treelist.cpp index fb24e23c64..c6305209e7 100644 --- a/protocols/JabberG/jabber_treelist.cpp +++ b/protocols/JabberG/jabber_treelist.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 Victor Pavlychko 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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_userinfo.cpp b/protocols/JabberG/jabber_userinfo.cpp index 3ba8bfa57e..f79202ca73 100644 --- a/protocols/JabberG/jabber_userinfo.cpp +++ b/protocols/JabberG/jabber_userinfo.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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" @@ -392,8 +388,8 @@ static void sttFillUserInfo( CJabberProto* ppro, HWND hwndTree, JABBER_LIST_ITEM item->itemResource.statusMessage ? item->itemResource.statusMessage : TranslateT( "" ), sttInfoLineId(0, INFOLINE_LOGOFF_MSG)); // activity - if (( item->lastSeenResource >= 0 ) && ( item->lastSeenResource < item->resourceCount )) - lstrcpyn( buf, item->resource[item->lastSeenResource].resourceName, SIZEOF( buf )); + if ( item->lastSeenResource ) + lstrcpyn( buf, item->lastSeenResource->resourceName, SIZEOF( buf )); else lstrcpyn( buf, TranslateT( "" ), SIZEOF( buf )); diff --git a/protocols/JabberG/jabber_util.cpp b/protocols/JabberG/jabber_util.cpp index 9df7bd2620..31c4ead6c7 100644 --- a/protocols/JabberG/jabber_util.cpp +++ b/protocols/JabberG/jabber_util.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 14060 $ -Last change on : $Date: 2012-02-06 18:41:59 +0200 (Пн, 06 фев 2012) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" @@ -1050,15 +1046,6 @@ TCHAR* CJabberProto::GetClientJID( const TCHAR* jid, TCHAR* dest, size_t destLen dest[ len ] = '\0'; TCHAR* p = _tcschr( dest, '/' ); - - JABBER_LIST_ITEM* LI = ListGetItemPtr( LIST_ROSTER, jid ); - if ( LI && LI->resourceCount == 1 && LI->resource[ 0 ].szCapsNode && - _tcsicmp( LI->resource[ 0 ].szCapsNode, _T( "http://talk.google.com/xmpp/bot/caps")) == 0) - { - if ( p ) *p = 0; - return dest; - } - if ( p == NULL ) { TCHAR* resource = ListGetBestResourceNamePtr( jid ); if ( resource != NULL ) diff --git a/protocols/JabberG/jabber_vcard.cpp b/protocols/JabberG/jabber_vcard.cpp index 70213922f8..3d43c0f650 100644 --- a/protocols/JabberG/jabber_vcard.cpp +++ b/protocols/JabberG/jabber_vcard.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 14120 $ -Last change on : $Date: 2012-03-05 17:39:37 +0200 (Пн, 05 мар 2012) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_ws.cpp b/protocols/JabberG/jabber_ws.cpp index 1a0b423f7d..fcb6753f85 100644 --- a/protocols/JabberG/jabber_ws.cpp +++ b/protocols/JabberG/jabber_ws.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 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,10 +18,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_xml.cpp b/protocols/JabberG/jabber_xml.cpp index 158882c195..287a335243 100644 --- a/protocols/JabberG/jabber_xml.cpp +++ b/protocols/JabberG/jabber_xml.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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_xml.h b/protocols/JabberG/jabber_xml.h index 96cdbed413..0a1b41e511 100644 --- a/protocols/JabberG/jabber_xml.h +++ b/protocols/JabberG/jabber_xml.h @@ -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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_XML_H_ diff --git a/protocols/JabberG/jabber_xstatus.cpp b/protocols/JabberG/jabber_xstatus.cpp index d35c5a4b88..cd1f5c9a50 100644 --- a/protocols/JabberG/jabber_xstatus.cpp +++ b/protocols/JabberG/jabber_xstatus.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: 13500 $ -Last change on : $Date: 2011-03-25 15:14:31 +0200 (Пт, 25 мар 2011) $ -Last change by : $Author: Michael.Kunz@s2005.TU-Chemnitz.de $ - */ #include "jabber.h" diff --git a/protocols/JabberG/jabber_xstatus.h b/protocols/JabberG/jabber_xstatus.h index 8470050aa6..ae12ebae86 100644 --- a/protocols/JabberG/jabber_xstatus.h +++ b/protocols/JabberG/jabber_xstatus.h @@ -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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13456 $ -Last change on : $Date: 2011-03-17 23:02:28 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef _JABBER_XSTATUS_H_ diff --git a/protocols/JabberG/jabber_zstream.cpp b/protocols/JabberG/jabber_zstream.cpp index 2d7967f0a4..11829bf401 100644 --- a/protocols/JabberG/jabber_zstream.cpp +++ b/protocols/JabberG/jabber_zstream.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM XEP-0138 (Stream Compression) implementation -Copyright ( C ) 2005-11 George Hazan +Copyright ( C ) 2005-12 George Hazan Copyright ( C ) 2007 Kostya Chukavin, Taras Zackrepa This program is free software; you can redistribute it and/or @@ -20,10 +20,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: 13898 $ -Last change on : $Date: 2011-11-02 05:38:43 +0200 (Ср, 02 ноя 2011) $ -Last change by : $Author: borkra $ - */ #include "jabber.h" diff --git a/protocols/JabberG/ui_utils.cpp b/protocols/JabberG/ui_utils.cpp index eb91ecb74b..3e0db611a8 100644 --- a/protocols/JabberG/ui_utils.cpp +++ b/protocols/JabberG/ui_utils.cpp @@ -17,10 +17,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: 13134 $ -Last change on : $Date: 2010-11-17 16:53:21 +0200 (Ср, 17 ноя 2010) $ -Last change by : $Author: george.hazan $ - */ #include "jabber.h" diff --git a/protocols/JabberG/ui_utils.h b/protocols/JabberG/ui_utils.h index 4be15802db..9af9e8ba36 100644 --- a/protocols/JabberG/ui_utils.h +++ b/protocols/JabberG/ui_utils.h @@ -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-09 Maxim Mluhov Copyright ( C ) 2007-09 Victor Pavlychko @@ -20,10 +20,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: 13452 $ -Last change on : $Date: 2011-03-17 21:12:56 +0200 (Чт, 17 мар 2011) $ -Last change by : $Author: george.hazan $ - */ #ifndef __jabber_ui_utils_h__ -- cgit v1.2.3