diff options
Diffstat (limited to 'protocols/Yahoo')
| -rw-r--r-- | protocols/Yahoo/src/user_info.cpp | 3 | ||||
| -rw-r--r-- | protocols/Yahoo/src/util.cpp | 15 | ||||
| -rw-r--r-- | protocols/Yahoo/src/yahoo.h | 1 |
3 files changed, 7 insertions, 12 deletions
diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp index 1b768a7c78..26c8e484c9 100644 --- a/protocols/Yahoo/src/user_info.cpp +++ b/protocols/Yahoo/src/user_info.cpp @@ -120,13 +120,14 @@ int __cdecl CYahooProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam ) odp.cbSize = sizeof( odp );
odp.hInstance = hInstance;
odp.dwInitParam = (LPARAM)this;
+ odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE;
HANDLE hContact = ( HANDLE )lParam;
if ( IsMyContact(hContact)) {
odp.pfnDlgProc = YahooUserInfoDlgProc;
odp.position = -1900000000;
odp.pszTemplate = MAKEINTRESOURCEA( IDD_USER_INFO );
- odp.pszTitle = m_szModuleName;
+ odp.ptszTitle = m_tszUserName;
UserInfo_AddPage(wParam, &odp);
}
diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp index aa5aa7803e..d0c54de4b4 100644 --- a/protocols/Yahoo/src/util.cpp +++ b/protocols/Yahoo/src/util.cpp @@ -196,7 +196,7 @@ DWORD CYahooProto::SetStringUtf(HANDLE hContact, const char* valueName, const ch /////////////////////////////////////////////////////////////////////////////////////////
// Popups
-static int CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
+static LRESULT CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
{
switch(message) {
case WM_COMMAND:
@@ -232,11 +232,11 @@ static int CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPA int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char *szURL)
{
- if ( !ServiceExists(MS_POPUP_ADDPOPUPEX))
+ if ( !ServiceExists(MS_POPUP_ADDPOPUPT))
return 0;
POPUPDATAT ppd = { 0 };
- ppd.PluginWindowProc = (WNDPROC)PopupWindowProc;
+ ppd.PluginWindowProc = PopupWindowProc;
lstrcpyn(ppd.lptzContactName, nickname, SIZEOF(ppd.lptzContactName));
lstrcpyn(ppd.lptzText, msg, SIZEOF(ppd.lptzText));
@@ -248,7 +248,7 @@ int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char * DebugLog("[MS_POPUP_ADDPOPUPEX] Generating a popup for [%S] %S", nickname, msg);
- CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0);
+ PUAddPopUpT(&ppd);
return 1;
}
@@ -262,7 +262,7 @@ int CYahooProto::ShowNotification(const TCHAR *title, const TCHAR *info, DWORD f err.tszInfo = (TCHAR*)info;
err.dwInfoFlags = flags | NIIF_INTERN_UNICODE;
err.uTimeout = 1000 * 3;
- int ret = CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM) & err);
+ INT_PTR ret = CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM) & err);
if (ret == 0)
return 1;
}
@@ -306,11 +306,6 @@ bool CYahooProto::IsMyContact(HANDLE hContact) return szProto && !strcmp(szProto, m_szModuleName);
}
-char* YAHOO_GetContactName(HANDLE hContact)
-{
- return (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0);
-}
-
extern PLUGININFOEX pluginInfo;
/*
diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h index f60556bf97..3241092599 100644 --- a/protocols/Yahoo/src/yahoo.h +++ b/protocols/Yahoo/src/yahoo.h @@ -128,7 +128,6 @@ int GetStatus(WPARAM wParam,LPARAM lParam); yahoo_status miranda_to_yahoo(int myyahooStatus);
void register_callbacks();
-char* YAHOO_GetContactName(HANDLE hContact);
#ifdef __GNUC__
int DebugLog( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2)));
|