diff options
| author | Robert Pösel <robyer@seznam.cz> | 2013-05-10 10:47:35 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2013-05-10 10:47:35 +0000 |
| commit | 729ba893c3ede0053be2c15fa54c9f9d828dbe0b (patch) | |
| tree | 8f8b759d4b93cafc7efad0a0f9e6103f456f2daf | |
| parent | 443225723338ab61362ae37f7058c3f643febdf5 (diff) | |
Skype:
- Fixed showing own birthdate with day=1 or month=1
- Fixed crash when no own language set
git-svn-id: http://svn.miranda-ng.org/main/trunk@4619 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/Skype/src/skype_dialogs.cpp | 5 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_own_info.cpp | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 1fd0d44191..feb92db25c 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -451,7 +451,7 @@ INT_PTR CALLBACK CSkypeProto::PersonalSkypeDlgProc(HWND hwndDlg, UINT msg, WPARA ::SendMessage(GetDlgItem(hwndDlg, IDC_BIRTH_DAY), CB_ADDSTRING, 0, (LPARAM)date);
}
BYTE bday = ::db_get_b(NULL, ppro->m_szModuleName, "BirthDay", 0);
- if (bday > 1 && bday < 32)
+ if (bday > 0 && bday < 32)
{
::mir_sntprintf(date, 3, L"%02d", bday);
::SetDlgItemText(hwndDlg, IDC_BIRTH_DAY, date);
@@ -463,7 +463,7 @@ INT_PTR CALLBACK CSkypeProto::PersonalSkypeDlgProc(HWND hwndDlg, UINT msg, WPARA ::SendMessage(::GetDlgItem(hwndDlg, IDC_BIRTH_MONTH), CB_ADDSTRING, 0, (LPARAM)date);
}
BYTE bmon = ::db_get_b(NULL, ppro->m_szModuleName, "BirthMonth", 0);
- if (bmon > 1 && bmon < 13)
+ if (bmon > 0 && bmon < 13)
{
::mir_sntprintf(date, 3, L"%02d", bmon);
::SetDlgItemText(hwndDlg, IDC_BIRTH_MONTH, date);
@@ -475,7 +475,6 @@ INT_PTR CALLBACK CSkypeProto::PersonalSkypeDlgProc(HWND hwndDlg, UINT msg, WPARA {
::_itow(i, date, 10);
::SendMessage(::GetDlgItem(hwndDlg, IDC_BIRTH_YEAR), CB_ADDSTRING, 0, (LPARAM)date);
-
}
WORD byear = ::db_get_w(NULL, ppro->m_szModuleName, "BirthYear", 0);
if (byear > 1900 && bmon < 2214)
diff --git a/protocols/Skype/src/skype_own_info.cpp b/protocols/Skype/src/skype_own_info.cpp index 47e58b524a..4a3b5415fc 100644 --- a/protocols/Skype/src/skype_own_info.cpp +++ b/protocols/Skype/src/skype_own_info.cpp @@ -49,10 +49,12 @@ void CSkypeProto::SaveOwnInfoToServer(HWND hwndPage, int iPage) this->account->SetIntProperty(Account::P_BIRTHDAY, value);
int lang = ::SendMessage(GetDlgItem(hwndPage, IDC_LANGUAGE), CB_GETCURSEL, 0, 0);
- std::wstring key = *(std::wstring *)SendMessage(GetDlgItem(hwndPage, IDC_LANGUAGE), CB_GETITEMDATA, lang, 0);
- this->account->SetStrProperty(
- Account::P_LANGUAGES,
- (char*)mir_ptr<char>(::mir_utf8encodeW(CSkypeProto::languages[key].c_str())));
+ if (lang != -1) {
+ std::wstring key = *(std::wstring *)SendMessage(GetDlgItem(hwndPage, IDC_LANGUAGE), CB_GETITEMDATA, lang, 0);
+ this->account->SetStrProperty(
+ Account::P_LANGUAGES,
+ (char*)mir_ptr<char>(::mir_utf8encodeW(CSkypeProto::languages[key].c_str())));
+ }
}
break;
|