From 176fb1d22df02c5791815a0764273c0b8da1d3d4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 6 Jun 2016 10:37:18 +0000 Subject: YAHOO: static functions removed from class git-svn-id: http://svn.miranda-ng.org/main/trunk@16924 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/src/chat.cpp | 4 ++-- protocols/Yahoo/src/icolib.cpp | 8 ++++---- protocols/Yahoo/src/main.cpp | 2 +- protocols/Yahoo/src/proto.cpp | 1 - protocols/Yahoo/src/proto.h | 6 ------ protocols/Yahoo/src/services.cpp | 2 +- protocols/Yahoo/src/stdafx.h | 8 +++++++- protocols/Yahoo/src/version.h | 6 +++--- 8 files changed, 18 insertions(+), 19 deletions(-) (limited to 'protocols') diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp index 6071675b01..4999c4947c 100644 --- a/protocols/Yahoo/src/chat.cpp +++ b/protocols/Yahoo/src/chat.cpp @@ -423,7 +423,7 @@ INT_PTR CALLBACK InviteToChatDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); param = (InviteChatParam*)lParam; - Window_SetIcon_IcoLib(hwndDlg, param->ppro->GetIconHandle(IDI_YAHOO)); + Window_SetIcon_IcoLib(hwndDlg, GetIconHandle(IDI_YAHOO)); SetDlgItemTextA(hwndDlg, IDC_ROOMNAME, param->room); SetDlgItemText(hwndDlg, IDC_MSG, TranslateT("Join My Conference...")); @@ -514,7 +514,7 @@ INT_PTR CALLBACK ChatRequestDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); param = (InviteChatReqParam*)lParam; - Window_SetIcon_IcoLib(hwndDlg, param->ppro->GetIconHandle(IDI_YAHOO)); + Window_SetIcon_IcoLib(hwndDlg, GetIconHandle(IDI_YAHOO)); SetDlgItemTextA(hwndDlg, IDC_SCREENNAME, param->who); SetDlgItemText(hwndDlg, IDC_MSG, param->msg); diff --git a/protocols/Yahoo/src/icolib.cpp b/protocols/Yahoo/src/icolib.cpp index fc9144d14b..886ad3578a 100644 --- a/protocols/Yahoo/src/icolib.cpp +++ b/protocols/Yahoo/src/icolib.cpp @@ -28,19 +28,19 @@ static IconItem iconList[] = { LPGEN("Calendar"), "calendar", IDI_CALENDAR } }; -void CYahooProto::IconsInit(void) +void IconsInit(void) { Icon_Register(hInstance, "Protocols/YAHOO", iconList, _countof(iconList), "YAHOO"); } -HICON CYahooProto::LoadIconEx(const char* name, bool big) +HICON LoadIconEx(const char* name, bool big) { char szSettingName[100]; mir_snprintf(szSettingName, "YAHOO_%s", name); return IcoLib_GetIcon(szSettingName, big); } -HANDLE CYahooProto::GetIconHandle(int iconId) +HANDLE GetIconHandle(int iconId) { for (unsigned i = 0; i < _countof(iconList); i++) if (iconList[i].defIconID == iconId) @@ -49,7 +49,7 @@ HANDLE CYahooProto::GetIconHandle(int iconId) return NULL; } -void CYahooProto::ReleaseIconEx(const char* name, bool big) +void ReleaseIconEx(const char* name, bool big) { char szSettingName[100]; mir_snprintf(szSettingName, "YAHOO_%s", name); diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp index b89e7d0199..18c7f1cdd4 100644 --- a/protocols/Yahoo/src/main.cpp +++ b/protocols/Yahoo/src/main.cpp @@ -114,12 +114,12 @@ extern "C" int __declspec(dllexport)Load(void) nlu.ptszDescriptiveName = TranslateT("YAHOO plugin HTTP connections"); g_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu); + IconsInit(); YmsgrLinksInit(); /** * Register LibYahoo2 callback functions */ register_callbacks(); - return 0; } diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 645bbb95bb..c3682e5696 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -38,7 +38,6 @@ CYahooProto::CYahooProto(const char *aProtoName, const TCHAR *aUserName) SkinAddNewSoundExT("mail", m_tszUserName, LPGENT("New E-mail available in Inbox")); LoadYahooServices(); - IconsInit(); } CYahooProto::~CYahooProto() diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h index 992b9292c3..0f2324ec75 100644 --- a/protocols/Yahoo/src/proto.h +++ b/protocols/Yahoo/src/proto.h @@ -168,12 +168,6 @@ struct CYahooProto : public PROTO void ext_got_file7info(const char *me, const char *who, const char *url, const char *fname, const char *ft_token); void ext_ft7_send_file(const char *me, const char *who, const char *filename, const char *token, const char *ft_token); - //====| icolib.cpp |================================================================== - void IconsInit( void ); - HICON LoadIconEx(const char* name, bool big = false); - HANDLE GetIconHandle(int iconId); - void ReleaseIconEx(const char* name, bool big = false); - //====| ignore.cpp |================================================================== const YList* GetIgnoreList(void); void IgnoreBuddy(const char *buddy, int ignore); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index 9e4635ab47..bd171957f6 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -120,7 +120,7 @@ static INT_PTR CALLBACK DlgProcSetCustStat(HWND hwndDlg, UINT msg, WPARAM wParam CYahooProto* ppro = (CYahooProto*)lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); - Window_SetIcon_IcoLib(hwndDlg, ppro->GetIconHandle(IDI_YAHOO)); + Window_SetIcon_IcoLib(hwndDlg, GetIconHandle(IDI_YAHOO)); if (!ppro->getString(YAHOO_CUSTSTATDB, &dbv)) { SetDlgItemTextA(hwndDlg, IDC_CUSTSTAT, dbv.pszVal); diff --git a/protocols/Yahoo/src/stdafx.h b/protocols/Yahoo/src/stdafx.h index cd3dc79f7d..e35b8dcfd5 100644 --- a/protocols/Yahoo/src/stdafx.h +++ b/protocols/Yahoo/src/stdafx.h @@ -112,7 +112,13 @@ struct YAHOO_SEARCH_RESULT : public PROTOSEARCHRESULT int YAHOO_util_dbsettingchanged(WPARAM wParam, LPARAM lParam); -//Services.c +// icolib.cpp +void IconsInit(void); +HICON LoadIconEx(const char* name, bool big = false); +HANDLE GetIconHandle(int iconId); +void ReleaseIconEx(const char* name, bool big = false); + +// Services.c int SetStatus(WPARAM wParam,LPARAM lParam); int GetStatus(WPARAM wParam,LPARAM lParam); diff --git a/protocols/Yahoo/src/version.h b/protocols/Yahoo/src/version.h index e6c4a66171..5fa300b8a7 100644 --- a/protocols/Yahoo/src/version.h +++ b/protocols/Yahoo/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 -#define __MINOR_VERSION 11 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 2 +#define __MINOR_VERSION 95 +#define __RELEASE_NUM 5 +#define __BUILD_NUM 1 #include -- cgit v1.2.3