diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Skype/res/Resource.rc | 2 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_dialogs.cpp | 8 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_proto.h | 38 |
3 files changed, 24 insertions, 24 deletions
diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc index 1087a57104..3f31679407 100644 --- a/protocols/Skype/res/Resource.rc +++ b/protocols/Skype/res/Resource.rc @@ -224,7 +224,7 @@ BEGIN CONTROL "Use ports 80 and 443 as alternative incoming",IDC_USE_ALT_PORTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,97,276,10
PUSHBUTTON "Register new account",IDC_REGISTER,204,17,87,14,WS_DISABLED
- PUSHBUTTON "Chande password",IDC_CHANGE_PWD,204,33,87,14,WS_DISABLED
+ PUSHBUTTON "Change password",IDC_CHANGE_PWD,204,33,87,14,WS_DISABLED
END
diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 3869441fc9..f6b6740ff7 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -44,11 +44,11 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR SendMessage(GetDlgItem(hwnd, IDC_SL), EM_SETREADONLY, 1, 0);
SendMessage(GetDlgItem(hwnd, IDC_PW), EM_SETREADONLY, 1, 0);
SendMessage(GetDlgItem(hwnd, IDC_PORT), EM_SETREADONLY, 1, 0);
- SendMessage(GetDlgItem(hwnd, IDC_USE_ALT_PORTS), EM_SETREADONLY, 1, 0);
+ EnableWindow(GetDlgItem(hwnd, IDC_USE_ALT_PORTS), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_REGISTER), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_CHANGE_PWD), TRUE);
}
- else if (proto->GetSettingWord("Status") > 0)
+ else if (proto->GetSettingWord("Status") > ID_STATUS_OFFLINE)
{
EnableWindow(GetDlgItem(hwnd, IDC_REGISTER), FALSE);
}
@@ -63,7 +63,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR {
if ((HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())) return 0;
- if ( !proto->IsOnline() && proto->GetSettingWord("Status") == 0)
+ if (!proto->IsOnline() && proto->GetSettingWord("Status") <= ID_STATUS_OFFLINE)
{
char sid[128];
GetDlgItemTextA(hwnd, IDC_SL, sid, SIZEOF(sid));
@@ -151,7 +151,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR BOOL error;
int port = GetDlgItemInt(hwnd, IDC_PORT, &error, FALSE);
proto->SetSettingWord("Port", port);
- proto->SetSettingByte("UseAlternativePorts", IsDlgButtonChecked(hwnd, IDC_USE_ALT_PORTS) > 0);
+ proto->SetSettingByte("UseAlternativePorts", (BYTE)IsDlgButtonChecked(hwnd, IDC_USE_ALT_PORTS));
}
return TRUE;
diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 5e38e73c2a..7ac8b89ff0 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -180,25 +180,25 @@ struct PasswordChangeBoxParam }
};
-struct FileTransfer -{ - CSkypeProto* ppro; - SEBinary guid; - CTransfer::Refs transfers; - //char *who; - //char *msg; - //char *ftoken; - //char *relay; - //HANDLE hContact; - //int cancel; - //char *url; - //HANDLE hWaitEvent; - //DWORD action; - //int y7; - ////YList *files; - //PROTOFILETRANSFERSTATUS pfts; - - FileTransfer(CSkypeProto* ppro) { this->ppro = ppro; } +struct FileTransfer
+{
+ CSkypeProto* ppro;
+ SEBinary guid;
+ CTransfer::Refs transfers;
+ //char *who;
+ //char *msg;
+ //char *ftoken;
+ //char *relay;
+ //HANDLE hContact;
+ //int cancel;
+ //char *url;
+ //HANDLE hWaitEvent;
+ //DWORD action;
+ //int y7;
+ ////YList *files;
+ //PROTOFILETRANSFERSTATUS pfts;
+
+ FileTransfer(CSkypeProto* ppro) { this->ppro = ppro; }
};
struct CSkypeProto : public PROTO_INTERFACE
|