summaryrefslogtreecommitdiff
path: root/src/options.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-12-22 08:54:19 +0200
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-12-22 08:54:19 +0200
commit5735d6a9ee7c250bd563529a3226174efe74ba38 (patch)
tree5fe26082a536b3f2e03d87a2a4bb5f2c69954daa /src/options.cpp
parent925f25fc28a6edfe444412e13887456902514f13 (diff)
merged with mirnada ng main repo
Diffstat (limited to 'src/options.cpp')
-rwxr-xr-xsrc/options.cpp4
1 files changed, 2 insertions, 2 deletions
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", "");