diff options
| author | George Hazan <ghazan@miranda.im> | 2017-01-20 00:11:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-01-20 00:11:36 +0300 |
| commit | 92b173c3a8553b59077aa2757c9627cb4c73d29e (patch) | |
| tree | 99b7ebeff5c84ff27f1908eea79992e60618840f /protocols/MRA | |
| parent | 92e81067e7e81cefcea58f7e91f6d2d8c959fd0d (diff) | |
Chat_NewSession to return a pointer to a newly created session, not to dig it anymore
Diffstat (limited to 'protocols/MRA')
| -rw-r--r-- | protocols/MRA/src/Mra_functions.cpp | 13 | ||||
| -rw-r--r-- | protocols/MRA/src/stdafx.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index da0f03fd69..d894a0299f 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -526,16 +526,9 @@ MCONTACT CMraProto::MraHContactFromEmail(const CMStringA &szEmail, BOOL bAddIfNe //not already there: add
if (IsEMailChatAgent(szEmail)) {
CMStringW wszEMail = szEmail;
- if (Chat_NewSession(GCW_CHATROOM, m_szModuleName, wszEMail, wszEMail) == 0) {
- BOOL bChatAdded = FALSE;
- for (hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
- if (mraGetStringA(hContact, "ChatRoomID", szEMailLocal)) {
- if (szEMailLocal == szEmail) {
- bChatAdded = TRUE;
- break;
- }
- }
- }
+ GCSessionInfoBase *si = Chat_NewSession(GCW_CHATROOM, m_szModuleName, wszEMail, wszEMail);
+ if (si != 0) {
+ bool bChatAdded = (si->hContact != NULL);
if (bChatAdded == FALSE)
hContact = NULL;
}
diff --git a/protocols/MRA/src/stdafx.h b/protocols/MRA/src/stdafx.h index 29dfaa5fe9..6d61cdcc49 100644 --- a/protocols/MRA/src/stdafx.h +++ b/protocols/MRA/src/stdafx.h @@ -45,7 +45,7 @@ #include <m_nudge.h>
#include <m_folders.h>
#include <m_avatars.h>
-#include <m_chat.h>
+#include <m_chat_int.h>
#include <m_extraicons.h>
#include <m_music.h>
#include <m_xstatus.h>
|