diff options
author | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
commit | 5161fd3fe53b85f579cfece81e25b562f1fa56ae (patch) | |
tree | 3ac6979cd3774351cb68431da64ca014f1170e98 /protocols/JabberG/jabber_vcard.cpp | |
parent | ce6e5ab03d58151c4eda36d05a8436d337b2d3c0 (diff) |
- event code standardization for protocols
- fix for EVENTTYPE_AUTHREQUEST processing
- protocols' custom CallService core removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@1576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_vcard.cpp')
-rw-r--r-- | protocols/JabberG/jabber_vcard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/jabber_vcard.cpp b/protocols/JabberG/jabber_vcard.cpp index 3d43c0f650..691f3516ed 100644 --- a/protocols/JabberG/jabber_vcard.cpp +++ b/protocols/JabberG/jabber_vcard.cpp @@ -300,7 +300,7 @@ static INT_PTR CALLBACK PhotoDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPA dat->ppro->Log( "Temp file = " TCHAR_STR_PARAM, szTempFileName );
if ( CopyFile( szAvatarFileName, szTempFileName, FALSE ) == TRUE ) {
char* p = mir_t2a( szTempFileName );
- if (( dat->hBitmap=( HBITMAP ) JCallService( MS_UTILS_LOADBITMAP, 0, ( LPARAM )p )) != NULL ) {
+ if (( dat->hBitmap=( HBITMAP ) CallService( MS_UTILS_LOADBITMAP, 0, ( LPARAM )p )) != NULL ) {
JabberBitmapPremultiplyChannels( dat->hBitmap );
_tcscpy( dat->ppro->m_szPhotoFileName, szTempFileName );
EnableWindow( GetDlgItem( hwndDlg, IDC_DELETE ), TRUE );
@@ -327,7 +327,7 @@ static INT_PTR CALLBACK PhotoDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPA TCHAR szFilter[512];
TCHAR szFileName[MAX_PATH];
- JCallService( MS_UTILS_GETBITMAPFILTERSTRINGST, SIZEOF( szFilter ), ( LPARAM )szFilter );
+ CallService( MS_UTILS_GETBITMAPFILTERSTRINGST, SIZEOF( szFilter ), ( LPARAM )szFilter );
OPENFILENAME ofn = {0};
ofn.lStructSize = sizeof(ofn);
@@ -353,7 +353,7 @@ static INT_PTR CALLBACK PhotoDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPA dat->ppro->Log( "Temp file = " TCHAR_STR_PARAM, szTempFileName );
if ( CopyFile( szFileName, szTempFileName, FALSE ) == TRUE ) {
char* pszTemp = mir_t2a( szTempFileName );
- if (( hNewBitmap=( HBITMAP ) JCallService( MS_UTILS_LOADBITMAP, 0, ( LPARAM )pszTemp )) != NULL ) {
+ if (( hNewBitmap=( HBITMAP ) CallService( MS_UTILS_LOADBITMAP, 0, ( LPARAM )pszTemp )) != NULL ) {
if ( dat->hBitmap ) {
DeleteObject( dat->hBitmap );
DeleteFile( dat->ppro->m_szPhotoFileName );
|