From 65c13e2c1fe1c205ac6c5e0062a6a99389fc9af0 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 25 Sep 2015 16:05:58 +0000 Subject: MSN: - fixed overwriting custom nicks (fixes #1045) git-svn-id: http://svn.miranda-ng.org/main/trunk@15442 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_mail.cpp | 2 +- protocols/MSN/src/msn_soapab.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index 375c28873c..37349ce087 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -393,6 +393,6 @@ void CMsnProto::displayEmailCount(MCONTACT hContact) mir_sntprintf(szNick, getByte("DisableHotmailJunk", 0) ? _T("%s [%d]") : _T("%s [%d][%d]"), name, mUnreadMessages, mUnreadJunkEmails); nickChg = true; - db_set_ts(hContact, "CList", "MyHandle", szNick); + setTString(hContact, "Nick", szNick); nickChg = false; } diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp index a6cc884788..e0cd772cad 100644 --- a/protocols/MSN/src/msn_soapab.cpp +++ b/protocols/MSN/src/msn_soapab.cpp @@ -686,7 +686,7 @@ bool CMsnProto::MSN_ABFind(const char* szMethod, const char* szGuid, bool deltas while (anot != NULL) { if (mir_strcmp(ezxml_txt(ezxml_child(anot, "Name")), "AB.NickName") == 0) { szNick = ezxml_txt(ezxml_child(anot, "Value")); - db_set_utf(hContact, "CList", "MyHandle", szNick); + db_set_utf(hContact, m_szModuleName, "Nick", szNick); } if (mir_strcmp(ezxml_txt(ezxml_child(anot, "Name")), "AB.JobTitle") == 0) { const char *szTmp = ezxml_txt(ezxml_child(anot, "Value")); @@ -695,7 +695,7 @@ bool CMsnProto::MSN_ABFind(const char* szMethod, const char* szGuid, bool deltas anot = ezxml_next(anot); } if (szNick == NULL) - db_unset(hContact, "CList", "MyHandle"); + delSetting(hContact,"Nick"); setString(hContact, "ID", szContId); @@ -911,8 +911,10 @@ bool CMsnProto::MSN_ABRefreshClist(void) if (!hContact) continue; const char* szNick = ezxml_txt(ezxml_child(pers, "orderedName")); - if (*szNick) db_set_utf(hContact, "CList", "MyHandle", szNick); - else db_unset(hContact, "CList", "MyHandle"); + if (*szNick) + db_set_utf(hContact, m_szModuleName, "Nick", szNick); + else + delSetting(hContact, "Nick"); if (mir_strcmpi(ezxml_txt(ezxml_child(pers, "onHideList")), "true") == 0) db_set_b(hContact, "CList", "Hidden", 1); setString(hContact, "ID", ezxml_txt(ezxml_child(pers, "id"))); -- cgit v1.2.3