From 4bb5a1db945eb4027279213201e91da33351fb7e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 7 Jul 2012 14:46:18 +0000 Subject: MS_SYSTEM_GETCONTACTINFO in UserInfoEx is made persistent git-svn-id: http://svn.miranda-ng.org/main/trunk@812 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/svc_contactinfo.cpp | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'plugins/UserInfoEx/svc_contactinfo.cpp') diff --git a/plugins/UserInfoEx/svc_contactinfo.cpp b/plugins/UserInfoEx/svc_contactinfo.cpp index 06053e8e7f..6a54880e67 100644 --- a/plugins/UserInfoEx/svc_contactinfo.cpp +++ b/plugins/UserInfoEx/svc_contactinfo.cpp @@ -780,24 +780,19 @@ static INT OnSettingChanged(WPARAM wParam, LPARAM lParam) VOID SvcContactInfoLoadModule() { CreateServiceFunction(MS_DB_CONTACT_GETSETTING_STR_EX, GetContactSettingStrExService); + CreateServiceFunction(MS_CONTACT_GETCONTACTINFO, GetContactInfo); - if (DB::Setting::GetByte(SET_GETCONTACTINFO_ENABLED, DEFVAL_GETCONTACTINFO_ENABLED)) - { - if (!myDestroyServiceFunction(MS_CONTACT_GETCONTACTINFO)) { - if (CreateServiceFunction(MS_CONTACT_GETCONTACTINFO, GetContactInfo)) { - DBVARIANT dbv; - if (DB::Setting::GetAString(NULL, "Contact", "NameOrder", &dbv)) { - BYTE i; - for (i = 0; i < NAMEORDERCOUNT; i++) { - gNameOrder[i] = i; - } - } - else { - memcpy(gNameOrder, dbv.pbVal, dbv.cpbVal); - DB::Variant::Free(&dbv); - } - HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnSettingChanged); - } + DBVARIANT dbv; + if (DB::Setting::GetAString(NULL, "Contact", "NameOrder", &dbv)) { + BYTE i; + for (i = 0; i < NAMEORDERCOUNT; i++) { + gNameOrder[i] = i; } } + else { + memcpy(gNameOrder, dbv.pbVal, dbv.cpbVal); + DB::Variant::Free(&dbv); + } + + HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnSettingChanged); } -- cgit v1.2.3