diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 8 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.h | 1 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 9e7f84c48d..fd5dd54ec1 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -1325,17 +1325,13 @@ int __cdecl CJabberProto::SetStatus(int iNewStatus) m_ThreadInfo->send("</stream:stream>");
m_ThreadInfo->shutdown();
-
- if (m_bJabberConnected) {
- m_bJabberConnected = m_bJabberOnline = FALSE;
- RebuildInfoFrame();
- }
+ RebuildInfoFrame();
}
m_iStatus = m_iDesiredStatus = ID_STATUS_OFFLINE;
JSendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)oldStatus, m_iStatus);
}
- else if ( !m_bJabberConnected && !m_ThreadInfo && !(m_iStatus >= ID_STATUS_CONNECTING && m_iStatus < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {
+ else if (!m_ThreadInfo && !(m_iStatus >= ID_STATUS_CONNECTING && m_iStatus < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {
m_iStatus = ID_STATUS_CONNECTING;
ThreadData* thread = new ThreadData(this, JABBER_SESSION_NORMAL);
JSendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)oldStatus, m_iStatus);
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 0b898e90bd..97093aefdf 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -248,7 +248,6 @@ struct CJabberProto : public PROTO_INTERFACE TCHAR* m_szJabberJID;
char* m_szStreamId;
- BOOL m_bJabberConnected; // TCP connection to jabber server established
BOOL m_bJabberOnline; // XMPP connection initialized and we can send XMPP packets
int m_nJabberSearchID;
time_t m_tmJabberLoggedInTime;
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index a2a5745d28..287e489816 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -457,7 +457,6 @@ LBL_FatalError: if (m_iDesiredStatus != ID_STATUS_OFFLINE || info->type == JABBER_SESSION_REGISTER) {
if (info->type == JABBER_SESSION_NORMAL) {
- m_bJabberConnected = TRUE;
size_t len = _tcslen(info->username) + strlen(info->server)+1;
m_szJabberJID = (TCHAR*)mir_alloc(sizeof(TCHAR)*(len+1));
mir_sntprintf(m_szJabberJID, len+1, _T("%s@%S"), info->username, info->server);
@@ -569,7 +568,6 @@ recvRest: if (info->type == JABBER_SESSION_NORMAL) {
m_iqManager.ExpireAll(info);
m_bJabberOnline = FALSE;
- m_bJabberConnected = FALSE;
info->zlibUninit();
EnableMenuItems(FALSE);
RebuildInfoFrame();
|