diff options
| author | George Hazan <ghazan@miranda.im> | 2019-10-02 20:42:44 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-10-02 20:42:44 +0300 |
| commit | 7a948f1ef804ecd9971b0869e0591c22944fa6da (patch) | |
| tree | cdc2df2e2d5f186da4b8778b4e1c9e79013ff921 /protocols | |
| parent | 9fe4e9044069e70b3f0e1df0e187f5ea43805ea1 (diff) | |
merge with SrmmLogContainer
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_disco.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 915ef15c64..ea858072a7 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1277,7 +1277,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK *g if (item == nullptr) {
item = ppro->ListGetItemPtr(LIST_CHATROOM, roomJid);
if (item != nullptr) {
- item->type = "conference";
+ replaceStr(item->type, "conference");
MCONTACT hContact = ppro->HContactFromJID(item->jid);
item->name = Clist_GetContactDisplayName(hContact);
ppro->AddEditBookmark(item);
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 1b0ddb05e7..e9371fa477 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -1252,7 +1252,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM item->name = mir_utf8decodeW(pNode->GetName());
}
- item->type = "conference";
+ replaceStr(item->type, "conference");
AddEditBookmark(item);
}
}
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 31392c3549..7d14342722 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -519,7 +519,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM hContact, LPARAM) JABBER_LIST_ITEM *item = new JABBER_LIST_ITEM();
item->jid = mir_strdup(roomID);
item->name = Clist_GetContactDisplayName(hContact);
- item->type = "conference";
+ item->type = mir_strdup("conference");
item->nick = getUStringA(hContact, "MyNick");
AddEditBookmark(item);
delete item;
|