From 32cc6d62a154d5724c40085f22747df2ee2ff4cb Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 10 May 2013 15:07:47 +0000 Subject: - fixed several issues in own details saving - fixed issues with contacts look cycle in db - fixed freez offline status after login error - other few bugs git-svn-id: http://svn.miranda-ng.org/main/trunk@4621 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_dialogs.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'protocols/Skype/src/skype_dialogs.cpp') diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index feb92db25c..980b7f81a6 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -485,7 +485,7 @@ INT_PTR CALLBACK CSkypeProto::PersonalSkypeDlgProc(HWND hwndDlg, UINT msg, WPARA mir_ptr lang( ::db_get_wsa(NULL, ppro->m_szModuleName, "Language1")); for (auto it = CSkypeProto::languages.begin(); it != CSkypeProto::languages.end(); ++it) { - /*int nItem = */::SendMessage( + ::SendMessage( ::GetDlgItem(hwndDlg, IDC_LANGUAGE), CB_ADDSTRING, 0, @@ -493,10 +493,13 @@ INT_PTR CALLBACK CSkypeProto::PersonalSkypeDlgProc(HWND hwndDlg, UINT msg, WPARA ::SendMessage( ::GetDlgItem(hwndDlg, IDC_LANGUAGE), - CB_SETITEMDATA, i++, (LPARAM)&it->first); + CB_SETITEMDATA, + i, + (LPARAM)&it->first); if (lang && it->second.compare(lang) == 0) - ::SetDlgItemText(hwndDlg, IDC_LANGUAGE, ::TranslateTS(it->second.c_str())); + ::SendMessage(GetDlgItem(hwndDlg, IDC_LANGUAGE), CB_SETCURSEL, i, 0); + i++; } // nick @@ -694,22 +697,20 @@ INT_PTR CALLBACK CSkypeProto::HomeSkypeDlgProc(HWND hwndDlg, UINT msg, WPARAM wP ::SendMessage( ::GetDlgItem(hwndDlg, IDC_COUNTRY), CB_SETITEMDATA, - i, - (LPARAM)g_countries[i].id); + nItem, + (LPARAM)&g_countries[i].ISOcode); if (countr && ::wcscmp(country, countr) == 0) - ::SetDlgItemText(hwndDlg, IDC_COUNTRY, TranslateTS(country)); + ::SendMessage(GetDlgItem(hwndDlg, IDC_COUNTRY), CB_SETCURSEL, nItem, 0); ::mir_free(country); } } - tmi.prepareList((HANDLE)lParam, GetDlgItem(hwndDlg, IDC_TIMEZONE), TZF_PLF_CB); - //HANDLE hTimeZone = tmi.createByContact ? tmi.createByContact(NULL, 0) : 0; - //LPCTSTR TzDescr = tmi.getTzDescription(tmi.getTzName(hTimeZone)); - //SetDlgItemText(hwndDlg, IDC_TIMEZONE, TzDescr); - - //BYTE nTz = ::db_get_b(NULL, ppro->m_szModuleName, "Timezone", 0); + tmi.prepareList((HANDLE)lParam, ::GetDlgItem(hwndDlg, IDC_TIMEZONE), TZF_PLF_CB); + HANDLE hTimeZone = tmi.createByContact ? tmi.createByContact(NULL, 0) : 0; + LPCTSTR TzDescr = tmi.getTzDescription(tmi.getTzName(hTimeZone)); + ::SetDlgItemText(hwndDlg, IDC_TIMEZONE, TzDescr); } break; -- cgit v1.2.3