From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 17:42:08 +0000 Subject: another portion of "#ifdef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ClientChangeNotify/ClientChangeNotify.cpp | 8 ++++---- plugins/ClientChangeNotify/Common.h | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins/ClientChangeNotify') diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/ClientChangeNotify.cpp index a19c41e128..8ce9f2080d 100644 --- a/plugins/ClientChangeNotify/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/ClientChangeNotify.cpp @@ -416,15 +416,15 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) update.pbVersion = (BYTE*)CreateVersionString(PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), szVersion); update.cpbVersion = (int)strlen((char*)update.pbVersion); update.szUpdateURL = "http://deathdemon.int.ru/projects/ClientChangeNotify" -#ifdef _UNICODE + "W" -#endif + ".zip"; update.szVersionURL = "http://deathdemon.int.ru/updaterinfo.php"; update.pbVersionPrefix = (BYTE*)"ClientChangeNotify" -#ifdef _UNICODE + " Unicode" -#endif + " version "; update.cpbVersionPrefix = (int)strlen((char*)update.pbVersionPrefix); CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update); diff --git a/plugins/ClientChangeNotify/Common.h b/plugins/ClientChangeNotify/Common.h index d45b6d007d..483724fdb1 100644 --- a/plugins/ClientChangeNotify/Common.h +++ b/plugins/ClientChangeNotify/Common.h @@ -136,13 +136,10 @@ struct SHOWPOPUP_DATA // additional m_popup.h declarations -#ifdef _UNICODE + #define POPUPDATAT POPUPDATAW #define MS_POPUP_ADDPOPUPT MS_POPUP_ADDPOPUPW -#else - #define POPUPDATAT POPUPDATAEX - #define MS_POPUP_ADDPOPUPT MS_POPUP_ADDPOPUPEX -#endif + int ContactSettingChanged(WPARAM wParam, LPARAM lParam); -- cgit v1.2.3