From 11fcecff7c310c2cc10bda2ab2fa2daf525be571 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 13 Mar 2013 08:00:41 +0000 Subject: - another portion of '#ifdef UNICODE' clean up git-svn-id: http://svn.miranda-ng.org/main/trunk@3993 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirOTR/MirOTR/src/svcs_srmm.cpp | 4 ---- plugins/MirOTR/MirOTR/src/utils.cpp | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp index d07a47c627..ed17aa29ab 100644 --- a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp +++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp @@ -268,11 +268,7 @@ void InitSRMM() { OTRButton.dwButtonID = 0; OTRButton.pszModuleName = MODULENAME; OTRButton.dwDefPos = 200; -#ifdef _UNICODE OTRButton.bbbFlags = BBBF_ISRSIDEBUTTON|BBBF_CANBEHIDDEN|BBBF_ISIMBUTTON; -#else - OTRButton.bbbFlags = BBBF_ISRSIDEBUTTON|BBBF_CANBEHIDDEN|BBBF_ISIMBUTTON|BBBF_ANSITOOLTIP; -#endif OTRButton.ptszTooltip = TranslateT(LANG_OTR_TOOLTIP); OTRButton.hIcon = GetIconHandle(ICON_NOT_PRIVATE); HookEvent(ME_MSG_TOOLBARLOADED, SVC_ButtonsBarLoaded); diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp index af8d43673b..fcd18ba98e 100644 --- a/plugins/MirOTR/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/MirOTR/src/utils.cpp @@ -230,11 +230,9 @@ void ShowWarning(TCHAR *msg) { sn.szProto= MODULENAME; sn.tszInfoTitle = buffer; sn.tszInfo = msg; -#ifdef _UNICODE + sn.dwInfoFlags = NIIF_WARNING | NIIF_INTERN_UNICODE; -#else - sn.dwInfoFlags = NIIF_WARNING; -#endif + sn.uTimeout = 10; CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&sn); @@ -276,11 +274,9 @@ void ShowError(TCHAR *msg) { sn.szProto = MODULENAME; sn.tszInfoTitle = buffer; sn.tszInfo = msg; -#ifdef _UNICODE + sn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE; -#else - sn.dwInfoFlags = NIIF_ERROR; -#endif + sn.uTimeout = 10; CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&sn); -- cgit v1.2.3