From 5735d6a9ee7c250bd563529a3226174efe74ba38 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 22 Dec 2012 08:54:19 +0200 Subject: merged with mirnada ng main repo --- src/options.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/options.cpp') diff --git a/src/options.cpp b/src/options.cpp index be20c44..17a383f 100755 --- a/src/options.cpp +++ b/src/options.cpp @@ -83,7 +83,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.ptszTitle = _T(szGPGModuleName); odp.ptszGroup = LPGENT("Services"); odp.ptszTab = LPGENT("Advanced"); - odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY | ODPF_TCHAR; + odp.flags=ODPF_BOLDGROUPS | ODPF_TCHAR; odp.pfnDlgProc = DlgProcGpgAdvOpts; Options_AddPage(wParam, &odp); @@ -156,7 +156,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP item.pszText = name; iRow = ListView_InsertItem(hwndList, &item); ListView_SetItemText(hwndList, iRow, 0, name); - TCHAR *tmp = mir_a2t((char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)); + TCHAR *tmp = mir_a2t(GetContactProto(hContact)); ListView_SetItemText(hwndList, iRow, 4, tmp); mir_free(tmp); tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", ""); -- cgit v1.2.3