diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-02 17:15:49 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-02 17:15:49 +0000 |
| commit | 53b1b8e2ec83e13c5c7f7d87cd0da87313a3c8ec (patch) | |
| tree | 4d8ed926ede9fc1e0af6d59c9c1574398ec02787 | |
| parent | e9076c9059c357a52b511ac3f27887602b1254d0 (diff) | |
fix for old avatar setting code in AVS
git-svn-id: http://svn.miranda-ng.org/main/trunk@5902 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/AVS/src/image_utils.cpp | 12 | ||||
| -rw-r--r-- | plugins/AVS/src/options.cpp | 43 |
2 files changed, 17 insertions, 38 deletions
diff --git a/plugins/AVS/src/image_utils.cpp b/plugins/AVS/src/image_utils.cpp index 3092e47519..f081908245 100644 --- a/plugins/AVS/src/image_utils.cpp +++ b/plugins/AVS/src/image_utils.cpp @@ -717,15 +717,9 @@ BOOL MakeTransparentBkg(HANDLE hContact, HBITMAP *hBitmap) int SaveAvatar( const char* protocol, const TCHAR* tszFileName )
{
- int result = CallProtoService(protocol, PS_SETMYAVATART, 0, ( LPARAM )tszFileName);
- if ( result == CALLSERVICE_NOTFOUND ) {
- if ( tszFileName != NULL ) {
- char szFileName[ MAX_PATH ];
- WideCharToMultiByte( CP_ACP, 0, tszFileName, -1, szFileName, SIZEOF(szFileName), 0, 0 );
- result = CallProtoService(protocol, PS_SETMYAVATAR, 0, ( LPARAM )szFileName);
- }
- else result = CallProtoService(protocol, PS_SETMYAVATAR, 0, 0);
- }
+ INT_PTR result = CallProtoService(protocol, PS_SETMYAVATART, 0, ( LPARAM )tszFileName);
+ if ( result == CALLSERVICE_NOTFOUND )
+ result = CallProtoService(protocol, PS_SETMYAVATAR, 0, (LPARAM)(char*)_T2A(tszFileName));
return result;
}
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 193de068db..01b78cc9d8 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -932,22 +932,17 @@ static char* GetSelectedProtocol(HWND hwndDlg) static void EnableDisableControls(HWND hwndDlg, char *proto)
{
- if (IsDlgButtonChecked(hwndDlg, IDC_PER_PROTO))
- {
- if (proto == NULL)
- {
+ if (IsDlgButtonChecked(hwndDlg, IDC_PER_PROTO)) {
+ if (proto == NULL) {
EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), FALSE);
}
- else
- {
- if (!ProtoServiceExists(proto, PS_SETMYAVATAR))
- {
+ else {
+ if (!ProtoServiceExists(proto, PS_SETMYAVATAR) && !ProtoServiceExists(proto, PS_SETMYAVATARW)) {
EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), FALSE);
}
- else
- {
+ else {
EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), TRUE);
int width, height;
@@ -956,16 +951,12 @@ static void EnableDisableControls(HWND hwndDlg, char *proto) }
}
}
- else
- {
+ else {
EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), TRUE);
if (db_get_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1))
- {
EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), TRUE);
- }
- else
- {
+ else {
int width, height;
SendDlgItemMessage(hwndDlg, IDC_PROTOPIC, AVATAR_GETUSEDSPACE, (WPARAM) &width, (LPARAM) &height);
EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), (LPARAM) width != 0 || height != 0);
@@ -988,10 +979,8 @@ static void EnableDisableProtocols(HWND hwndDlg, BOOL init) BOOL perProto = IsDlgButtonChecked(hwndDlg, IDC_PER_PROTO);
HWND hwndList = GetDlgItem(hwndDlg, IDC_PROTOCOLS);
- if (perProto)
- {
- if (!init && !IsWindowVisible(hwndList))
- {
+ if (perProto) {
+ if (!init && !IsWindowVisible(hwndList)) {
// Show list of protocols
ShowWindow(hwndList, SW_SHOW);
@@ -1006,16 +995,13 @@ static void EnableDisableProtocols(HWND hwndDlg, BOOL init) {
ListView_SetItemState(hwndList, 0, LVIS_FOCUSED | LVIS_SELECTED, 0x0F);
}
- else
- {
+ else {
SendDlgItemMessage(hwndDlg, IDC_PROTOPIC, AVATAR_SETPROTOCOL, 0, (LPARAM) proto);
EnableDisableControls(hwndDlg, proto);
}
}
- else
- {
- if (init || IsWindowVisible(hwndList))
- {
+ else {
+ if (init || IsWindowVisible(hwndList)) {
// Show list of protocols
ShowWindow(hwndList, SW_HIDE);
@@ -1057,11 +1043,10 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP // List protocols
PROTOACCOUNT **accs;
- int i, count, num = 0;
+ int count, num = 0;
ProtoEnumAccounts( &count, &accs );
- for (i = 0; i < count; i++)
- {
+ for (int i = 0; i < count; i++) {
if ( !ProtoServiceExists( accs[i]->szModuleName, PS_GETMYAVATAR))
continue;
|