diff options
| author | George Hazan <ghazan@miranda.im> | 2022-01-30 18:39:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-01-30 18:39:25 +0300 |
| commit | 1c008b3bda59815fbe9e690826accfb043b27c07 (patch) | |
| tree | 2b0660358ddde07b8397c04a996e4099715602cf /plugins/UserInfoEx/src/ex_import | |
| parent | bd5c44b8596067d5fffbd253ec9f5399dbd72339 (diff) | |
fixes #3001 (WhenWasIt: remove mBirthday support)
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import')
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 1 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 13 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | 6 |
3 files changed, 6 insertions, 14 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 6827856ce7..3e4cd100de 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -152,7 +152,6 @@ int CExImContactXML::ExportContact(DB::CEnumList *pModules) }
else {
ExportModule(USERINFO);
- ExportModule(MOD_MBIRTHDAY);
}
}
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index 105c770ddb..46abcece72 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -245,7 +245,6 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar // insert essential items (modul from UIEX)
ExportTree_AddItem(hTree, hItemEssential, USERINFO, bImagesLoaded, 0);
- ExportTree_AddItem(hTree, hItemEssential, MOD_MBIRTHDAY, bImagesLoaded, 0);
/*Filter/ protocol module is ignored for owner contact
if (pDat->hContact != NULL) {
@@ -303,7 +302,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar // add optional module, which is valid for at least one contact
/*/Filter/*/
- if (mir_strcmpi(p, USERINFO) && mir_strcmpi(p, MOD_MBIRTHDAY) && mir_strcmpi(p, META_PROTO)) {
+ if (mir_strcmpi(p, USERINFO) && mir_strcmpi(p, META_PROTO)) {
ExportTree_AddItem(hTree, hItemOptional, p, bImagesLoaded, 1);
break;
}
@@ -312,16 +311,10 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar } // end TRUE = All Contacts
// module must exist in the selected contact
- else if (
- /*Filter/*/
- !DB::Module::IsEmpty(pDat->ExImContact->hContact, p) &&
- (!pDat->ExImContact->hContact || mir_strcmpi(p, pszProto)) &&
- //mir_strcmpi(p, "Protocol") &&
- mir_strcmpi(p, USERINFO) &&
- mir_strcmpi(p, MOD_MBIRTHDAY)) {
+ else if (!DB::Module::IsEmpty(pDat->ExImContact->hContact, p) && (!pDat->ExImContact->hContact || mir_strcmpi(p, pszProto)) && mir_strcmpi(p, USERINFO)) {
ExportTree_AddItem(hTree, hItemOptional, (LPSTR)p, bImagesLoaded, 1);
}
- } // end
+ }
}
}
}
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index f7cba427a6..1dc8fc82d4 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -1234,13 +1234,13 @@ uint8_t CVCardFileVCF::Import() memcpy(buf, _clVal.GetBuffer(), 4);
buf[4] = 0;
- db_set_w(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHYEAR, (uint16_t)strtol(buf, nullptr, 10));
+ db_set_w(_hContact, USERINFO, SET_CONTACT_BIRTHYEAR, (uint16_t)strtol(buf, nullptr, 10));
memcpy(buf, _clVal.GetBuffer() + 4, 2);
buf[2] = 0;
- db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHMONTH, (uint8_t)strtol(buf, nullptr, 10));
+ db_set_b(_hContact, USERINFO, SET_CONTACT_BIRTHMONTH, (uint8_t)strtol(buf, nullptr, 10));
memcpy(buf, _clVal.GetBuffer() + 6, 2);
buf[2] = 0;
- db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHDAY, (uint8_t)strtol(buf, nullptr, 10));
+ db_set_b(_hContact, USERINFO, SET_CONTACT_BIRTHDAY, (uint8_t)strtol(buf, nullptr, 10));
}
}
continue;
|