From 3c50a9aa27d2138b757dd7822841c106f4c99b18 Mon Sep 17 00:00:00 2001 From: sje Date: Fri, 20 Jul 2007 17:26:51 +0000 Subject: convert to new popup api (see m_yapp.h in yapp/docs) git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@297 4f64403b-2f21-0410-a795-97e2b3489a10 --- otr/utils.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'otr/utils.cpp') diff --git a/otr/utils.cpp b/otr/utils.cpp index 79e4a2d..9f77b2c 100644 --- a/otr/utils.cpp +++ b/otr/utils.cpp @@ -1,6 +1,5 @@ #include "common.h" #include "utils.h" -#include "../../include/m_popup.h" #include "options.h" #include "menu.h" @@ -60,7 +59,7 @@ void ShowPopup( const char* line1, const char* line2, int timeout ) return; } - if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) { + if(ServiceExists(MS_YAPP_CLASSINSTANCE)) { ShowClassPopup(popup_class_name, (char *)line1, (char *)line2); } else { POPUPDATAEX* ppd = ( POPUPDATAEX* )calloc( sizeof( POPUPDATAEX ), 1 ); @@ -276,16 +275,16 @@ void InitUtils() { hUnlockIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_STOP), IMAGE_ICON, 16, 16, 0); } - if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) { + if(ServiceExists(MS_YAPP_REGISTERCLASS)) { mir_snprintf(popup_class_name, 128, "%s/Notify", MODULE); - POPUPCLASS test = {0}; + PopupClass test = {0}; test.cbSize = sizeof(test); test.hIcon = hProtoIcon; test.pszDescription = Translate("OTR"); test.pszName = popup_class_name; - test.PluginWindowProc = NullWindowProc; - CallService(MS_POPUP_REGISTERCLASS, 0, (WPARAM)&test); + test.windowProc = NullWindowProc; + CallService(MS_YAPP_REGISTERCLASS, 0, (WPARAM)&test); } } -- cgit v1.2.3