From 3f23417a1099f73dc28ec1b7d6ec2a1a7fc2b7a2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Jun 2012 20:53:59 +0000 Subject: - PLUGININFO structure removed at all; - Options_AddPage & UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services respectively - total internal redesign of options' translation - code reformatting git-svn-id: http://svn.miranda-ng.org/main/trunk@477 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/options.cpp | 6 +++--- protocols/Yahoo/user_info.cpp | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'protocols/Yahoo') diff --git a/protocols/Yahoo/options.cpp b/protocols/Yahoo/options.cpp index 01fa96330a..da51259fcc 100644 --- a/protocols/Yahoo/options.cpp +++ b/protocols/Yahoo/options.cpp @@ -381,17 +381,17 @@ INT_PTR __cdecl CYahooProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pfnDlgProc = DlgProcYahooOpts; odp.dwInitParam = LPARAM(this); - YAHOO_CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Connection"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO_CONNECTION); odp.pfnDlgProc = DlgProcYahooOptsConn; - YAHOO_CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Ignore List"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO_IGNORE); odp.pfnDlgProc = DlgProcYahooOptsIgnore; - YAHOO_CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); + Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/Yahoo/user_info.cpp b/protocols/Yahoo/user_info.cpp index b82d26a495..77b06344f6 100644 --- a/protocols/Yahoo/user_info.cpp +++ b/protocols/Yahoo/user_info.cpp @@ -122,17 +122,14 @@ INT_PTR __cdecl CYahooProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam ) odp.dwInitParam = ( LPARAM )this; HANDLE hContact = ( HANDLE )lParam; - if ( hContact ) - { + if ( hContact ) { char* szProto = ( char* )CallService( MS_PROTO_GETCONTACTBASEPROTO, ( WPARAM ) hContact, 0 ); - if ( szProto != NULL && !strcmp( szProto, m_szModuleName )) - { + if ( szProto != NULL && !strcmp( szProto, m_szModuleName )) { odp.pfnDlgProc = YahooUserInfoDlgProc; odp.position = -1900000000; odp.pszTemplate = MAKEINTRESOURCEA( IDD_USER_INFO ); odp.pszTitle = m_szModuleName; - CallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); - + UserInfo_AddPage(wParam, &odp); } } -- cgit v1.2.3