From 5161fd3fe53b85f579cfece81e25b562f1fa56ae Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Sep 2012 11:50:15 +0000 Subject: - 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 --- protocols/JabberG/jabber_vcard.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG/jabber_vcard.cpp') 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 ); -- cgit v1.2.3