From 418cfb6cb57c9e02ffb9f5aafc747a9dc5b76883 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Jan 2014 19:24:02 +0000 Subject: no need to close chat room windows in Jabber after logoff git-svn-id: http://svn.miranda-ng.org/main/trunk@7887 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_proto.cpp | 7 ------- protocols/JabberG/src/jabber_thread.cpp | 10 ---------- 2 files changed, 17 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 836b016cdd..3c1581a46f 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -1196,13 +1196,6 @@ int __cdecl CJabberProto::SetStatus(int iNewStatus) if (iNewStatus == ID_STATUS_OFFLINE) { if (m_ThreadInfo) { - if (m_bJabberOnline) { - // Quit all chatrooms (will send quit message) - LISTFOREACH(i, this, LIST_CHATROOM) - if (JABBER_LIST_ITEM *item = ListGetItemPtrFromIndex(i)) - GcQuit(item, 0, NULL); - } - m_ThreadInfo->send(""); m_ThreadInfo->shutdown(); RebuildInfoFrame(); diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index a4bb4f7cc4..d3b33c5afa 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -121,14 +121,6 @@ static VOID CALLBACK JabberPasswordCreateDialogApcProc(void* param) CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_PASSWORD), NULL, JabberPasswordDlgProc, (LPARAM)param); } -static VOID CALLBACK JabberOfflineChatWindows(void* param) -{ - CJabberProto *ppro = (CJabberProto*)param; - GCDEST gcd = { ppro->m_szModuleName, NULL, GC_EVENT_CONTROL }; - GCEVENT gce = { sizeof(gce), &gcd }; - CallService(MS_GC_EVENT, SESSION_TERMINATE, (LPARAM)&gce); -} - ///////////////////////////////////////////////////////////////////////////////////////// // Jabber keep-alive thread @@ -549,8 +541,6 @@ recvRest: SendMessage(m_hwndJabberChangePassword, WM_COMMAND, MAKEWORD(IDCANCEL, 0), 0); } - CallFunctionAsync(JabberOfflineChatWindows, this); - ListRemoveList(LIST_CHATROOM); ListRemoveList(LIST_BOOKMARK); //UI_SAFE_NOTIFY(m_pDlgJabberJoinGroupchat, WM_JABBER_CHECK_ONLINE); -- cgit v1.2.3