diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-28 20:01:30 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-28 20:01:30 +0300 |
| commit | e7b69721b0d390cec3f81f97134a51bfef228cf8 (patch) | |
| tree | a56ef2bd15fa3c995a031bec35ce0113dec22b28 /plugins/New_GPG/src | |
| parent | 81ce57622c3166830b23eae534dacc6b008c659d (diff) | |
PFLAG_UNIQUEIDSETTING removed, its functionality transferred to Proto_SetUniqueId / Proto_GetUniqueId
Diffstat (limited to 'plugins/New_GPG/src')
| -rwxr-xr-x | plugins/New_GPG/src/utilities.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 7ec25605b9..27eef26991 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -1263,9 +1263,9 @@ void ExportGpGKeysFunc(int type) mir_free(k); } - const char* proto = (const char*)GetContactProto(hContact); + const char *proto = GetContactProto(hContact); std::string id = "Comment: login "; - const char * uid = (const char*)CallProtoService(proto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0); + const char *uid = Proto_GetUniqueId(proto); DBVARIANT dbv = { 0 }; db_get(0, proto, uid, &dbv); switch (dbv.type) { @@ -1467,7 +1467,7 @@ INT_PTR ImportGpGKeys(WPARAM, LPARAM) for (int i = 0; i < acc_count; i++) { if (acc.length()) break; - const char * uid = (const char*)CallProtoService(accs[i]->szModuleName, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0); + const char *uid = Proto_GetUniqueId(accs[i]->szModuleName); DBVARIANT dbv = { 0 }; db_get(0, accs[i]->szModuleName, uid, &dbv); std::string id; @@ -1532,7 +1532,7 @@ INT_PTR ImportGpGKeys(WPARAM, LPARAM) } } if (acc.length()) { - const char * uid = (const char*)CallProtoService(acc.c_str(), PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0); + const char *uid = Proto_GetUniqueId(acc.c_str()); for (auto &hContact : Contacts(acc.c_str())) { DBVARIANT dbv = { 0 }; db_get(hContact, acc.c_str(), uid, &dbv); |