From a04043571f2d04ff9d117f921115f97f7bf42870 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 13 Jun 2012 22:16:46 +0000 Subject: Unicode description is no longer needed in PluginInfo git-svn-id: http://svn.miranda-ng.org/main/trunk@401 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/main.cpp | 4 ---- plugins/Alarms/Version.h | 2 +- plugins/AuthState/version.h | 10 +-------- plugins/BASS_interface/Version.h | 11 ++-------- plugins/Bonsai/version.h | 5 ----- plugins/BossKeyPlus/BossKey.cpp | 2 +- plugins/BossKeyPlus/version.h | 14 +----------- plugins/CSList/Version.h | 12 +++-------- plugins/Clist_nicer/SRC/init.cpp | 24 +++++++++++---------- plugins/ContactsPlus/main.cpp | 6 +----- plugins/CyrTranslit/main.cpp | 18 ---------------- plugins/CyrTranslit/plugin.h | 2 +- plugins/Db_autobackups/version.h | 10 +-------- plugins/Dbx_mmap_SA/Import_SA/version.h | 10 +-------- plugins/Dbx_mmap_SA/version.h | 6 +----- plugins/FingerPrintModPlus/res/version.h | 16 ++------------ plugins/FlashAvatars/cflash.cpp | 2 +- plugins/FloatingContacts/version.h | 10 ++------- plugins/Folders/version.h | 6 +----- plugins/Gender/main.cpp | 4 ---- plugins/HistoryLinkListPlus/linklist.c | 10 +-------- plugins/HistorySweeperLight/main.c | 2 +- plugins/IEView/Version.h | 10 +-------- plugins/IgnoreState/Version.h | 10 +-------- plugins/MetaContacts/version.h | 5 ----- plugins/Mwclist/init.cpp | 6 +----- plugins/NewXstatusNotify/main.cpp | 8 ------- plugins/Nudge/main.cpp | 8 +------ plugins/PackUpdater/Version.h | 10 +-------- plugins/Popup/version.h | 32 ++++++++-------------------- plugins/QuickReplies/version.h | 4 ---- plugins/SecureIM/commonheaders.cpp | 2 +- plugins/SeenPlugin/main.c | 6 +----- plugins/Sessions/Version.h | 11 ++-------- plugins/SimpleAR/Version.h | 11 ++-------- plugins/SimpleStatusMsg/main.cpp | 10 ++------- plugins/SmileyAdd/main.cpp | 6 ------ plugins/SpellChecker/spellchecker.cpp | 10 ++------- plugins/SplashScreen/src/version.h | 10 +-------- plugins/StatusPlugins/KeepStatus/main.cpp | 6 +----- plugins/StatusPlugins/StartupStatus/main.cpp | 6 +----- plugins/StopSpamPlus/res/version.h | 4 ---- plugins/Svc_crshdmp/crshdmp.cpp | 6 ------ plugins/Svc_dbepp/Version.h | 10 +-------- plugins/Svc_vi/version.h | 11 +--------- plugins/TabSRMM/src/srmm.cpp | 8 ------- plugins/TipperYM/tipper.cpp | 8 ------- plugins/TranslitSwitcher/Version.h | 10 +-------- plugins/Updater/version.h | 10 +-------- plugins/UserInfoEx/Res/version.h | 21 ++++-------------- plugins/Variables/main.cpp | 8 ------- plugins/WhenWasIt/version.h | 10 +-------- plugins/YAPP/version.h | 6 +----- plugins/ZeroNotification/version.h | 16 +++++--------- plugins/mTextControl/src/version.h | 11 ++++------ 55 files changed, 81 insertions(+), 415 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/main.cpp b/plugins/AVS/main.cpp index 3de7a9a30a..999d62222e 100644 --- a/plugins/AVS/main.cpp +++ b/plugins/AVS/main.cpp @@ -99,11 +99,7 @@ FI_INTERFACE *fei = 0; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), -#if defined(_UNICODE) - "Avatar service (Unicode)", -#else "Avatar service", -#endif __VERSION_DWORD, "Load and manage contact pictures for other plugins.", "Nightwish, Pescuma", diff --git a/plugins/Alarms/Version.h b/plugins/Alarms/Version.h index 45934bc715..a57e674b6d 100644 --- a/plugins/Alarms/Version.h +++ b/plugins/Alarms/Version.h @@ -10,7 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#define __PLUGIN_NAME "Alarms" +#define __PLUGIN_NAME "Alarms" #define __INTERNAL_NAME "Alarms" #define __FILENAME "Alarms.dll" #define __DESCRIPTION "Set once-off, daily, weekly and weekday alarms." diff --git a/plugins/AuthState/version.h b/plugins/AuthState/version.h index 789453206d..3c39613d72 100644 --- a/plugins/AuthState/version.h +++ b/plugins/AuthState/version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Authorization State (Unicode x64)" -#else - #define __PLUGIN_NAME "Authorization State (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Authorization State" -#endif +#define __PLUGIN_NAME "Authorization State" #define __INTERNAL_NAME "AuthState" #define __FILENAME "AuthState.dll" #define __DESCRIPTION "If contact didn't authorized you this plugin puts an icon in front of contacts name." diff --git a/plugins/BASS_interface/Version.h b/plugins/BASS_interface/Version.h index 814a8951dd..f869458404 100644 --- a/plugins/BASS_interface/Version.h +++ b/plugins/BASS_interface/Version.h @@ -10,15 +10,8 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Bass_interface (Unicode x64)" -#else - #define __PLUGIN_NAME "Bass_interface (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Bass_interface" -#endif + +#define __PLUGIN_NAME "Bass_interface" #define __INTERNAL_NAME "Bass_interface" #define __FILENAME "Bass_interface.dll" #define __DESCRIPTION "un4seen's bass interface Miranda IM plugin." diff --git a/plugins/Bonsai/version.h b/plugins/Bonsai/version.h index 5ae566b4eb..30aa0c24c3 100644 --- a/plugins/Bonsai/version.h +++ b/plugins/Bonsai/version.h @@ -39,11 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOREMAIL "eblis102@yahoo.com" #define __COPYRIGHT "© 2006-2007 Cristian Libotean" #define __AUTHORWEB "http://www.miranda-im.org/" - -#if defined(WIN64) || defined(_WIN64) -#define __PLUGIN_DISPLAY_NAME "Bonsai (x64)" -#else #define __PLUGIN_DISPLAY_NAME "Bonsai" -#endif #endif //M_BONSAI_VERSION_H diff --git a/plugins/BossKeyPlus/BossKey.cpp b/plugins/BossKeyPlus/BossKey.cpp index 52eeb789f0..b0a21ef6d2 100644 --- a/plugins/BossKeyPlus/BossKey.cpp +++ b/plugins/BossKeyPlus/BossKey.cpp @@ -67,7 +67,7 @@ static PLUGININFOEX pluginInfo = { __AUTHORS, __EMAIL, __COPYRIGHTS, - __FL __PLUGIN_ID_STR, + __FL, UNICODE_AWARE, 0, //4fac353d-0a36-44a4-9064-6759c53ae782 diff --git a/plugins/BossKeyPlus/version.h b/plugins/BossKeyPlus/version.h index f2391d8f48..d11ef40695 100644 --- a/plugins/BossKeyPlus/version.h +++ b/plugins/BossKeyPlus/version.h @@ -2,22 +2,10 @@ #define __FILE_VERSION_STR "0, 5, 0, 3" #define __VERSION_DWORD 0x00050003 -#if defined ( _WIN64 ) -#define __MODULE_NAME "BossKey+ (x64)" +#define __MODULE_NAME "BossKey+" #define __PLUGIN_ID 4305 #define __PLUGIN_ID_STR "4305" -#define __PLUGIN_NAME "BossKey+ (x64)" -#elif defined ( _UNICODE ) -#define __MODULE_NAME "BossKey+ (Unicode)" -#define __PLUGIN_ID 3694 -#define __PLUGIN_ID_STR "3694" -#define __PLUGIN_NAME "BossKey+ (Unicode)" -#else -#define __MODULE_NAME "BossKey+" -#define __PLUGIN_ID 3655 -#define __PLUGIN_ID_STR "3655" #define __PLUGIN_NAME "BossKey+" -#endif #define __FL "http://addons.miranda-im.org/details.php?action=viewfile&id=" #define __DESC "Anti-Boss plugin." diff --git a/plugins/CSList/Version.h b/plugins/CSList/Version.h index dbf672ad17..8206c5c61f 100644 --- a/plugins/CSList/Version.h +++ b/plugins/CSList/Version.h @@ -10,15 +10,9 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Custom Status List (Unicode x64) mod" -#else - #define __PLUGIN_NAME "Custom Status List (Unicode) mod" -#endif -#else - #define __PLUGIN_NAME "Custom Status List mod" -#endif + + +#define __PLUGIN_NAME "Custom Status List mod" #define __INTERNAL_NAME "CSList" #define __FILENAME "CSList.dll" #define __DESCRIPTION "This plugin offers simple management functions to keep your extra statuses on one place." diff --git a/plugins/Clist_nicer/SRC/init.cpp b/plugins/Clist_nicer/SRC/init.cpp index ee3bb78732..47c1e5c249 100644 --- a/plugins/Clist_nicer/SRC/init.cpp +++ b/plugins/Clist_nicer/SRC/init.cpp @@ -103,17 +103,19 @@ INT_PTR TrayIconProcessMessage(WPARAM wParam, LPARAM lParam); void ( *saveRecalcScrollBar )(HWND hwnd, struct ClcData *dat); void RecalcScrollBar(HWND hwnd, struct ClcData *dat); -PLUGININFOEX pluginInfo = { -#if defined(_UNICODE) - sizeof(PLUGININFOEX), "CList Nicer+ (Unicode)", PLUGIN_MAKE_VERSION(0, 9, 2, 1), -#else - sizeof(PLUGININFOEX), "CList Nicer+", PLUGIN_MAKE_VERSION(0, 9, 2, 1), -#endif - "Display contacts, event notifications, protocol status", - "Pixel, egoDust, cyreve, Nightwish", "", "Copyright 2000-2010 Miranda-IM project", "http://www.miranda-im.org", - UNICODE_AWARE, - DEFMOD_CLISTALL, - {0x8f79b4ee, 0xeb48, 0x4a03, { 0x87, 0x3e, 0x27, 0xbe, 0x6b, 0x7e, 0x9a, 0x25 }} //{8F79B4EE-EB48-4a03-873E-27BE6B7E9A25} +PLUGININFOEX pluginInfo = +{ + sizeof(PLUGININFOEX), + "CList Nicer+", + PLUGIN_MAKE_VERSION(0, 9, 2, 1), + "Display contacts, event notifications, protocol status", + "Pixel, egoDust, cyreve, Nightwish", + "", + "Copyright 2000-2010 Miranda-IM project", + "http://www.miranda-im.org", + UNICODE_AWARE, + DEFMOD_CLISTALL, + {0x8f79b4ee, 0xeb48, 0x4a03, { 0x87, 0x3e, 0x27, 0xbe, 0x6b, 0x7e, 0x9a, 0x25 }} //{8F79B4EE-EB48-4a03-873E-27BE6B7E9A25} }; #if defined(_UNICODE) diff --git a/plugins/ContactsPlus/main.cpp b/plugins/ContactsPlus/main.cpp index de33f9338e..b1fa14744e 100644 --- a/plugins/ContactsPlus/main.cpp +++ b/plugins/ContactsPlus/main.cpp @@ -53,12 +53,8 @@ int g_UnicodeCore; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), -#ifdef WIN64 - "Send/Receive Contacts+ (x64)", -#else "Send/Receive Contacts+", -#endif - PLUGIN_MAKE_VERSION(1,5,2,0), + PLUGIN_MAKE_VERSION(1,5,2,0), "Allows you to send and receive contacts", "Joe Kucera, Todor Totev", "jokusoftware@miranda-im.org", diff --git a/plugins/CyrTranslit/main.cpp b/plugins/CyrTranslit/main.cpp index b35fa92ad0..dc675ff654 100644 --- a/plugins/CyrTranslit/main.cpp +++ b/plugins/CyrTranslit/main.cpp @@ -40,19 +40,6 @@ PLUGININFOEX pluginInfoEx={ MIID_V_CYRTRANSLIT, }; -PLUGININFO pluginInfo = { - sizeof(PLUGININFO), - PLG_SHORTNAME, - PLG_VERSION, - PLG_DESCRIPTION, - PLG_AUTHOR, - PLG_AUTHOREMAIL, - PLG_COPYRIGHT, - PLG_HOMEPAGE, - PLG_FLAGS, - PLG_REPLACESDEFMODULE, -}; - //------------------------------------------------------------------------------ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -68,11 +55,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - return &pluginInfo; -} - static const MUUID interfaces[] = {MIID_V_CYRTRANSLIT, MIID_LAST}; extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) diff --git a/plugins/CyrTranslit/plugin.h b/plugins/CyrTranslit/plugin.h index 95bddb306e..fd76b71391 100644 --- a/plugins/CyrTranslit/plugin.h +++ b/plugins/CyrTranslit/plugin.h @@ -47,7 +47,7 @@ /****** PLUGIN DEFINES *******************************************************/ // pluginInfo: -#define PLG_SHORTNAME "CyrTranslit (UNICODE)" +#define PLG_SHORTNAME "CyrTranslit" #define PLG_VERSION PLUGIN_MAKE_VERSION(1, 0, 3, 0) #define PLG_DESCRIPTION "Replaces (for the selected contacts only) the Cyrillic letters in the "\ "outgoing messages with the phonetically equivalent Latin letter "\ diff --git a/plugins/Db_autobackups/version.h b/plugins/Db_autobackups/version.h index 37c48ddca2..e7151dfccb 100644 --- a/plugins/Db_autobackups/version.h +++ b/plugins/Db_autobackups/version.h @@ -3,14 +3,6 @@ #define __VERSION_DWORD 0x00000008 #define __PLUGIN_NAME_BASE "DB Autobackuper" +#define __PLUGIN_NAME __PLUGIN_NAME_BASE #define __PLUGIN_DESC __PLUGIN_NAME_BASE " plugin." #define __COPYRIGHTS "© 2005-2011 chaos.persei, sje, Kildor, Billy_Bons, Vasilich" - -#if defined (_WIN64) -#define __PLUGIN_NAME __PLUGIN_NAME_BASE " (x64)" -#elif (UNICODE) -#define __PLUGIN_NAME __PLUGIN_NAME_BASE " (Unicode)" -#else -#define __PLUGIN_NAME __PLUGIN_NAME_BASE -#endif - diff --git a/plugins/Dbx_mmap_SA/Import_SA/version.h b/plugins/Dbx_mmap_SA/Import_SA/version.h index 43c674195b..8ab612f479 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/version.h +++ b/plugins/Dbx_mmap_SA/Import_SA/version.h @@ -3,15 +3,7 @@ #define __FILEVERSION_STRING MIRANDA_VERSION_FILEVERSION #define __VERSION_STRING MIRANDA_VERSION_STRING #define __VERSION_DWORD MIRANDA_VERSION_DWORD -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Import secured contacts and messages (Unicode x64)" -#else - #define __PLUGIN_NAME "Import secured contacts and messages (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Import secured contacts and messages " -#endif +#define __PLUGIN_NAME "Import secured contacts and messages " #define __INTERNAL_NAME "Import_sa" #define __FILENAME "Import_sa.dll" #define __DESCRIPTION "Imports contacts and messages from Mirabilis ICQ and Miranda IM. Enhanced modification with encrypted database support." diff --git a/plugins/Dbx_mmap_SA/version.h b/plugins/Dbx_mmap_SA/version.h index f8b9f43246..be4e5e20d1 100644 --- a/plugins/Dbx_mmap_SA/version.h +++ b/plugins/Dbx_mmap_SA/version.h @@ -1,8 +1,4 @@ #define __FILEVERSION_STRING 0,7,5,4 #define __VERSION_STRING "0.7.5.4" #define __VERSION_DWORD 0x00070504 -#if defined (_UNICODE) - #define __PLUGIN_NAME "Miranda SecuredMMAP database driver (Unicode)" -#else - #define __PLUGIN_NAME "Miranda SecuredMMAP database driver" -#endif +#define __PLUGIN_NAME "Miranda SecuredMMAP database driver" diff --git a/plugins/FingerPrintModPlus/res/version.h b/plugins/FingerPrintModPlus/res/version.h index 5e7c485aaf..19c859c524 100644 --- a/plugins/FingerPrintModPlus/res/version.h +++ b/plugins/FingerPrintModPlus/res/version.h @@ -31,24 +31,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) #define __VERSION_DWORD PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM) -#ifdef _UNICODE -#ifdef _WIN64 -#define __INTERNAL_NAME_STRING "Fingerprint Mod+ (x64)" -#define __PLUGIN_ID 4302 -#define __PLUGIN_ID_STR "4302" -#define __BETA_FILE_TITLE "fingerprint_x64" -#else //!_WIN64 -#define __INTERNAL_NAME_STRING "Fingerprint Mod+ (Unicode)" -#define __PLUGIN_ID 4301 -#define __PLUGIN_ID_STR "4301" -#define __BETA_FILE_TITLE "fingerprint_unicode" -#endif //_WIN64 -#else //!_UNICODE + #define __INTERNAL_NAME_STRING "Fingerprint Mod+" #define __PLUGIN_ID 4300 #define __PLUGIN_ID_STR "4300" #define __BETA_FILE_TITLE "fingerprint" -#endif //_UNICODE + #define __LEGAL_COPYRIGHT_STRING "©2009-2010 HierOS, ©2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer." diff --git a/plugins/FlashAvatars/cflash.cpp b/plugins/FlashAvatars/cflash.cpp index 12a0f1466a..a6fb4e7d32 100644 --- a/plugins/FlashAvatars/cflash.cpp +++ b/plugins/FlashAvatars/cflash.cpp @@ -35,7 +35,7 @@ PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - NULL, + "Flash Avatars", PLUGIN_MAKE_VERSION(0, 0, 1, 14), "Load and display flash avatars", "Big Muscle", diff --git a/plugins/FloatingContacts/version.h b/plugins/FloatingContacts/version.h index 2bc7b1cc21..3b8d0e8e20 100644 --- a/plugins/FloatingContacts/version.h +++ b/plugins/FloatingContacts/version.h @@ -8,19 +8,13 @@ #define MINIMAL_COREVERSION 0, 6, 0, 0 #define MINIMAL_COREVERSION_STR "0, 6, 0, 0" -#ifdef UNICODE -#define UNICODE_AWARE_STR " (Unicode)" -#else -#define UNICODE_AWARE_STR " (Ansi)" -#endif - #define FILE_VERSION COREVERSION_NUM BUILD_NUM -#define FILE_VERSION_STR COREVERSION_NUM_STR UNICODE_AWARE_STR " build " BUILD_NUM_STR " " REVISION +#define FILE_VERSION_STR COREVERSION_NUM_STR " build " BUILD_NUM_STR " " REVISION #define PRODUCT_VERSION FILE_VERSION #define PRODUCT_VERSION_STR FILE_VERSION_STR -#define __PLUGIN_NAME "Floating Contacts" UNICODE_AWARE_STR +#define __PLUGIN_NAME "Floating Contacts" #define __FILENAME "FltContacts.dll" #define __DESC "Floating Contacts plugin for Miranda" #define __AUTHOR "Iavor Vajarov, Kosh&chka, Victor Pavlychko" diff --git a/plugins/Folders/version.h b/plugins/Folders/version.h index 77f4d886fa..0e144ef86d 100644 --- a/plugins/Folders/version.h +++ b/plugins/Folders/version.h @@ -39,11 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOREMAIL "eblis102@yahoo.com" #define __COPYRIGHT "© 2005-2012 Cristian Libotean" #define __AUTHORWEB "http://www.miranda-im.org/" - -#if defined(WIN64) || defined(_WIN64) -#define __PLUGIN_DISPLAY_NAME "Custom profile folders (x64)" -#else #define __PLUGIN_DISPLAY_NAME "Custom profile folders" -#endif + #endif //M_FOLDERS_VERSION_H diff --git a/plugins/Gender/main.cpp b/plugins/Gender/main.cpp index 2b4ad0f750..fb66488c48 100644 --- a/plugins/Gender/main.cpp +++ b/plugins/Gender/main.cpp @@ -51,11 +51,7 @@ extern int onOptInitialise(WPARAM wParam, LPARAM lParam); PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), -#ifdef WIN64 - "Show Contact Gender (x64)", -#else "Show Contact Gender", -#endif PLUGIN_MAKE_VERSION(0,0,2,1), "Shows contacts gender as an icon in contact list", "Thief, idea by nile, icons by a0x", diff --git a/plugins/HistoryLinkListPlus/linklist.c b/plugins/HistoryLinkListPlus/linklist.c index 94b3797143..f41ce4de97 100644 --- a/plugins/HistoryLinkListPlus/linklist.c +++ b/plugins/HistoryLinkListPlus/linklist.c @@ -50,16 +50,8 @@ int hLangpack; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), -#ifdef _WIN64 - "History Linklist Plus (x64, Unicode)", -#else -#ifdef _UNICODE - "History Linklist Plus (Unicode)", -#else "History Linklist Plus", -#endif -#endif - PLUGIN_MAKE_VERSION(0,0,0,2), + PLUGIN_MAKE_VERSION(0,0,0,2), "Generates a list of extracted URIs from the history", "Thomas Wendel, gureedo", "gureedo@gmail.com", diff --git a/plugins/HistorySweeperLight/main.c b/plugins/HistorySweeperLight/main.c index f82ca35366..868a0952f6 100644 --- a/plugins/HistorySweeperLight/main.c +++ b/plugins/HistorySweeperLight/main.c @@ -34,7 +34,7 @@ static PLUGININFOEX pluginInfoEx = { // about plugin sizeof(PLUGININFOEX), - "History Sweeper Light Unicode", + "History Sweeper Light", __VERSION_DWORD, "This plugin can sweep system history, history from all contacts or only from chosen; also it may sweep history older than certain time; and may do it at Miranda IM startup/shutdown.", "Sergey V. Gershovich a.k.a. Jazzy$, Boris Krasnovskiy, tico-tico", diff --git a/plugins/IEView/Version.h b/plugins/IEView/Version.h index 283b79a98b..0d69c106e9 100644 --- a/plugins/IEView/Version.h +++ b/plugins/IEView/Version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "IEView (Unicode x64)" -#else - #define __PLUGIN_NAME "IEView (Unicode)" -#endif -#else - #define __PLUGIN_NAME "IEView" -#endif +#define __PLUGIN_NAME "IEView" #define __INTERNAL_NAME "IEView" #define __FILENAME "IEView.dll" #define __DESCRIPTION "IE Based Chat Log." diff --git a/plugins/IgnoreState/Version.h b/plugins/IgnoreState/Version.h index 414bfcbb0c..bdef9574cd 100644 --- a/plugins/IgnoreState/Version.h +++ b/plugins/IgnoreState/Version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "IgnoreState (Unicode x64)" -#else - #define __PLUGIN_NAME "IgnoreState (Unicode)" -#endif -#else - #define __PLUGIN_NAME "IgnoreState" -#endif +#define __PLUGIN_NAME "IgnoreState" #define __INTERNAL_NAME "IgnoreState" #define __FILENAME "IgnoreState.dll" #define __DESCRIPTION "Show ignore state of contact in contacts list." diff --git a/plugins/MetaContacts/version.h b/plugins/MetaContacts/version.h index 5c5bf65b3e..7a9bc5d860 100644 --- a/plugins/MetaContacts/version.h +++ b/plugins/MetaContacts/version.h @@ -17,11 +17,6 @@ #define __AUTHOREMAIL "mail@scottellis.com.au" #define __COPYRIGHT "© 2005,2006 Scott Ellis" #define __AUTHORWEB "http://www.scottellis.com.au" - -#ifdef _UNICODE -#define __PLUGIN_NAME "MetaContacts Plugin (Unicode)" -#else #define __PLUGIN_NAME "MetaContacts Plugin" -#endif #define __FILENAME "MetaContacts.dll" diff --git a/plugins/Mwclist/init.cpp b/plugins/Mwclist/init.cpp index 3ad3974a61..2c155b744d 100644 --- a/plugins/Mwclist/init.cpp +++ b/plugins/Mwclist/init.cpp @@ -80,11 +80,7 @@ extern int BGModuleUnload(); PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - #if defined( _UNICODE ) - "MultiWindow Contact List Unicode", - #else - "MultiWindow Contact List", - #endif + "MultiWindow Contact List", PLUGIN_MAKE_VERSION(0,9,0,0), "Display contacts, event notifications, protocol status with MW modifications", "", diff --git a/plugins/NewXstatusNotify/main.cpp b/plugins/NewXstatusNotify/main.cpp index 232fad10f2..ad2c628692 100644 --- a/plugins/NewXstatusNotify/main.cpp +++ b/plugins/NewXstatusNotify/main.cpp @@ -51,15 +51,7 @@ extern OPTIONS opt; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), -#ifdef _UNICODE - #ifdef _WIN64 - "NewXstatusNotify YM (Unicode x64)", - #else - "NewXstatusNotify YM (Unicode)", - #endif -#else "NewXstatusNotify YM", -#endif __VERSION_DWORD, "Notifies you when a contact changes his/her (X)status or status message.", "Luca Santarelli, Vasilich, yaho", diff --git a/plugins/Nudge/main.cpp b/plugins/Nudge/main.cpp index 7f47b89173..fb4575b50e 100644 --- a/plugins/Nudge/main.cpp +++ b/plugins/Nudge/main.cpp @@ -25,14 +25,8 @@ int hLangpack = 0; //======================== PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), -#ifdef WIN64 - "Nudge (x64)", -#elif UNICODE "Nudge", -#else - "Nudge (ANSI)", -#endif - PLUGIN_MAKE_VERSION(0,0,2,0), + PLUGIN_MAKE_VERSION(0,0,2,0), "Plugin to shake the clist and chat window", "Tweety/GouZ, FREAK_THEMIGHTY", "francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com", diff --git a/plugins/PackUpdater/Version.h b/plugins/PackUpdater/Version.h index 3958f338fc..a80b421922 100644 --- a/plugins/PackUpdater/Version.h +++ b/plugins/PackUpdater/Version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "PackUpdater (Unicode x64)" -#else - #define __PLUGIN_NAME "PackUpdater (Unicode)" -#endif -#else - #define __PLUGIN_NAME "PackUpdater" -#endif +#define __PLUGIN_NAME "PackUpdater" #define __INTERNAL_NAME "PackUpdater" #define __FILENAME "PackUpdater.dll" #define __DESCRIPTION "Simple updater for Miranda IM premodified packs." diff --git a/plugins/Popup/version.h b/plugins/Popup/version.h index 7b49620019..1d3f681270 100644 --- a/plugins/Popup/version.h +++ b/plugins/Popup/version.h @@ -35,29 +35,15 @@ Last change by : $Author: Merlin_de $ #define MODULNAME "PopUp" #define MODULNAME_LONG "Popup Plus" //dont use "PopUp Plus" coz notify register use "Popup Plus" #define MODULNAME_PLU "PopUps" - #ifdef _UNICODE - #define POPUP_FILENAME "PopUpW.dll" - #ifdef _WIN64 - #define POPUP_DISPLAYNAME "PopUp Plus (Unicode x64)" - #define __FLVersionURL "http://addons.miranda-im.org/details.php?action=viewfile&id=4293" - #define __FLVersionPrefix "PopUp Plus (Unicode x64) " - #define __FLUpdateURL "http://addons.miranda-im.org/feed.php?dlfile=4293" //.zip - #define __BetaUpdateURL "http://merlins-miranda.googlecode.com/files/PopUpW_x64.zip" - #else - #define POPUP_DISPLAYNAME "PopUp Plus (Unicode)" - #define __FLVersionURL "http://addons.miranda-im.org/details.php?action=viewfile&id=4292" - #define __FLVersionPrefix "PopUp Plus (Unicode) " - #define __FLUpdateURL "http://addons.miranda-im.org/feed.php?dlfile=4292" //.zip - #define __BetaUpdateURL "http://merlins-miranda.googlecode.com/files/PopUpW_x32.zip" - #endif //_WIN64 - #else - #define POPUP_DISPLAYNAME "PopUp Plus (2in1)" - #define POPUP_FILENAME "PopUp.dll" - #define __FLVersionURL "http://addons.miranda-im.org/details.php?action=viewfile&id=4294" - #define __FLVersionPrefix "PopUp Plus (2in1) " - #define __FLUpdateURL "http://addons.miranda-im.org/feed.php?dlfile=4294" //.zip - #define __BetaUpdateURL "http://merlins-miranda.googlecode.com/files/PopUp_2in1.zip" - #endif //_UNICODE + + #define POPUP_FILENAME "PopUp.dll" + #define POPUP_DISPLAYNAME "PopUp Plus" + #define __FLVersionURL "http://addons.miranda-im.org/details.php?action=viewfile&id=4292" + #define __FLVersionPrefix "PopUp Plus (Unicode) " + #define __FLUpdateURL "http://addons.miranda-im.org/feed.php?dlfile=4292" //.zip + #define __BetaUpdateURL "" + + #define __BetaVersionURL "http://svn.miranda.im/mainrepo/popup/trunk/docs/Changelog.txt" #define __BetaVersionPrefix "beta: " #define __BetaChangelogURL "http://svn.miranda.im/mainrepo/popup/trunk/docs/Changelog.txt" diff --git a/plugins/QuickReplies/version.h b/plugins/QuickReplies/version.h index d94c3418cf..721e65b12f 100644 --- a/plugins/QuickReplies/version.h +++ b/plugins/QuickReplies/version.h @@ -10,11 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#if defined (_UNICODE) -#define __PLUGIN_NAME "Quick Replies (Unicode)" -#else #define __PLUGIN_NAME "Quick Replies" -#endif #define __INTERNAL_NAME "QuickReplies" #define __FILENAME "quickreplies.dll" #define __DESCRIPTION "Plugin for quick insert (or sending) pre-defined messages in message input area." diff --git a/plugins/SecureIM/commonheaders.cpp b/plugins/SecureIM/commonheaders.cpp index 1200861828..5d6d0657c0 100644 --- a/plugins/SecureIM/commonheaders.cpp +++ b/plugins/SecureIM/commonheaders.cpp @@ -28,7 +28,7 @@ CRITICAL_SECTION localQueueMutex; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - MODULENAME" (2in1)", + MODULENAME, __VERSION_DWORD, MODULENAME" plugin for Miranda IM ("__DATE__")", "Johell, Ghost, Nightwish, __alex, Baloo", diff --git a/plugins/SeenPlugin/main.c b/plugins/SeenPlugin/main.c index 798077b009..c1aefc32e2 100644 --- a/plugins/SeenPlugin/main.c +++ b/plugins/SeenPlugin/main.c @@ -33,12 +33,8 @@ int hLangpack; char authemail[] = "fscking@spammer.oip.info";//the correct e-mail shall be constructed in DllMain PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), -#ifndef PERMITNSN - "Last seen", -#else "Last seen", -#endif - PLUGIN_MAKE_VERSION(5,0,4,7), + PLUGIN_MAKE_VERSION(5,0,4,7), "Log when a user was last seen online and which users were online while you were away.", "Heiko Schillinger, YB", authemail, diff --git a/plugins/Sessions/Version.h b/plugins/Sessions/Version.h index 35c74bfb55..44e6d972f4 100644 --- a/plugins/Sessions/Version.h +++ b/plugins/Sessions/Version.h @@ -10,15 +10,8 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Sessions (Unicode x64)" -#else - #define __PLUGIN_NAME "Sessions (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Sessions" -#endif + +#define __PLUGIN_NAME "Sessions" #define __INTERNAL_NAME "Sessions" #define __FILENAME "Sessions.dll" #define __DESCRIPTION "Sessions Manager for Miranda IM." diff --git a/plugins/SimpleAR/Version.h b/plugins/SimpleAR/Version.h index 06218191b2..c3d57d0a70 100644 --- a/plugins/SimpleAR/Version.h +++ b/plugins/SimpleAR/Version.h @@ -10,15 +10,8 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "SimpleAR (Unicode x64)" -#else - #define __PLUGIN_NAME "SimpleAR (Unicode)" -#endif -#else - #define __PLUGIN_NAME "SimpleAR" -#endif + +#define __PLUGIN_NAME "SimpleAR" #define __INTERNAL_NAME "Simple Auto Replier" #define __FILENAME "SimpleAR.dll" #define __DESCRIPTION "Simple Auto Replier." diff --git a/plugins/SimpleStatusMsg/main.cpp b/plugins/SimpleStatusMsg/main.cpp index 44beb6312e..def96c25c3 100644 --- a/plugins/SimpleStatusMsg/main.cpp +++ b/plugins/SimpleStatusMsg/main.cpp @@ -36,14 +36,8 @@ static HANDLE *hProtoStatusMenuItem; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), -#if defined(_WIN64) - "Simple Status Message (x64)", -#elif defined(_UNICODE) - "Simple Status Message (Unicode)", -#else - "Simple Status Message (ANSI)", -#endif - PLUGIN_MAKE_VERSION(1, 9, 0, 4), + "Simple Status Message", + PLUGIN_MAKE_VERSION(1, 9, 0, 4), "Provides a simple way to set status and away messages", "Bartosz 'Dezeath' Białek, Harven", "dezred"/*antispam*/"@"/*antispam*/"gmail"/*antispam*/"."/*antispam*/"com", diff --git a/plugins/SmileyAdd/main.cpp b/plugins/SmileyAdd/main.cpp index dd328cfff3..2515c6c076 100644 --- a/plugins/SmileyAdd/main.cpp +++ b/plugins/SmileyAdd/main.cpp @@ -48,13 +48,7 @@ UTF8_INTERFACE utfi; static const PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), -#if defined(_WIN64) - "SmileyAdd x64", -#elif defined(UNICODE) | defined(_UNICODE) - "SmileyAdd Unicode", -#else "SmileyAdd", -#endif __VERSION_DWORD, "Smiley support for Miranda Instant Messanger", "Peacow, nightwish, bid, borkra", diff --git a/plugins/SpellChecker/spellchecker.cpp b/plugins/SpellChecker/spellchecker.cpp index 6c81f480b5..fdccd20b49 100644 --- a/plugins/SpellChecker/spellchecker.cpp +++ b/plugins/SpellChecker/spellchecker.cpp @@ -25,14 +25,8 @@ Boston, MA 02111-1307, USA. PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), -#ifdef WIN64 - "Spell Checker (x64)", -#elif UNICODE - "Spell Checker (Unicode)", -#else - "Spell Checker (Ansi)", -#endif - PLUGIN_MAKE_VERSION(0,2,6,0), + "Spell Checker", + PLUGIN_MAKE_VERSION(0,2,6,0), "Spell checker for the message windows. Uses Hunspell to do the checking.", "Ricardo Pescuma Domenecci, FREAK_THEMIGHTY", "pescuma@miranda-im.org", diff --git a/plugins/SplashScreen/src/version.h b/plugins/SplashScreen/src/version.h index 98d6fc3ef0..09ca99ebe1 100644 --- a/plugins/SplashScreen/src/version.h +++ b/plugins/SplashScreen/src/version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Splash Screen (Unicode x64)" -#else - #define __PLUGIN_NAME "Splash Screen (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Splash Screen" -#endif +#define __PLUGIN_NAME "Splash Screen" #define __INTERNAL_NAME "AdvSplashScreen" #define __FILENAME "AdvSplashScreen.dll" #define __DESCRIPTION "Shows a splash at Miranda startup." diff --git a/plugins/StatusPlugins/KeepStatus/main.cpp b/plugins/StatusPlugins/KeepStatus/main.cpp index 09578aef1a..1910dec585 100644 --- a/plugins/StatusPlugins/KeepStatus/main.cpp +++ b/plugins/StatusPlugins/KeepStatus/main.cpp @@ -53,11 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) PLUGININFOEX pluginInfoEx={ sizeof(PLUGININFOEX), - #if defined( _UNICODE ) - __PLUGIN_NAME __PLATFORM_NAME " (Unicode)", - #else - __PLUGIN_NAME, - #endif + __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESC, __AUTHOR, diff --git a/plugins/StatusPlugins/StartupStatus/main.cpp b/plugins/StatusPlugins/StartupStatus/main.cpp index 577c7c2799..3349351afa 100644 --- a/plugins/StatusPlugins/StartupStatus/main.cpp +++ b/plugins/StatusPlugins/StartupStatus/main.cpp @@ -51,11 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) PLUGININFOEX pluginInfoEx={ sizeof(PLUGININFOEX), - #if defined( _UNICODE ) - __PLUGIN_NAME __PLATFORM_NAME " (Unicode)", - #else - __PLUGIN_NAME, - #endif + __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESC, __AUTHOR, diff --git a/plugins/StopSpamPlus/res/version.h b/plugins/StopSpamPlus/res/version.h index dd26e6a535..469a330f6f 100644 --- a/plugins/StopSpamPlus/res/version.h +++ b/plugins/StopSpamPlus/res/version.h @@ -21,11 +21,7 @@ //#define __PROD_REV_NUM 1234 // stuff that will be used in PluginInfo section and in Version resource -#if defined (_UNICODE) -#define __PLUGIN_NAME "StopSpam+ (Unicode)" -#else #define __PLUGIN_NAME "StopSpam+" -#endif #define __FILENAME "StopSpam.dll" #define __DESC "No more spam! Robots can't go! Only human beings invited!" #define __AUTHOR "Roman Miklashevsky, A. Petkevich, Kosh&chka, persei" diff --git a/plugins/Svc_crshdmp/crshdmp.cpp b/plugins/Svc_crshdmp/crshdmp.cpp index 765b4be53b..6a800d837f 100644 --- a/plugins/Svc_crshdmp/crshdmp.cpp +++ b/plugins/Svc_crshdmp/crshdmp.cpp @@ -49,13 +49,7 @@ bool dtsubfldr; static const PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), -#if defined(_WIN64) - "Crash Dumper x64", -#elif defined(_UNICODE) - "Crash Dumper Unicode", -#else "Crash Dumper", -#endif __VERSION_DWORD, "Crash Dumper for Miranda IM.", "borkra", diff --git a/plugins/Svc_dbepp/Version.h b/plugins/Svc_dbepp/Version.h index 9ce8b1874c..565dddb582 100644 --- a/plugins/Svc_dbepp/Version.h +++ b/plugins/Svc_dbepp/Version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Database Editor++ (Unicode x64)" -#else - #define __PLUGIN_NAME "Database Editor++ (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Database Editor++" -#endif +#define __PLUGIN_NAME "Database Editor++" #define __INTERNAL_NAME "DBEditor" #define __FILENAME "Svc_dbepp.dll" #define __DESCRIPTION "Advanced Database Editor." diff --git a/plugins/Svc_vi/version.h b/plugins/Svc_vi/version.h index 94286db8dc..200ac05349 100644 --- a/plugins/Svc_vi/version.h +++ b/plugins/Svc_vi/version.h @@ -39,15 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOREMAIL "hrk@users.sourceforge.net, eblis102@yahoo.com, ghazan@miranda.im" #define __COPYRIGHT "© 2002-2005 Luca Santarelli, © 2005-2009 Cristian Libotean" #define __AUTHORWEB "http://www.miranda-im.org/" - -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_DISPLAY_NAME "Version Information x64 (Unicode)" -#else - #if defined(UNICODE) - #define __PLUGIN_DISPLAY_NAME "Version Information (Unicode)" - #else - #define __PLUGIN_DISPLAY_NAME "Version Information" - #endif -#endif +#define __PLUGIN_DISPLAY_NAME "Version Information" #endif //M_VERSIONINFO_VERSION_H diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp index 9bddecfa1b..ebb6cb002c 100644 --- a/plugins/TabSRMM/src/srmm.cpp +++ b/plugins/TabSRMM/src/srmm.cpp @@ -57,16 +57,8 @@ PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), #ifdef __GNUWIN32__ "TabSRMM (MINGW32)", -#else -#ifdef _WIN64 - "TabSRMM (x64, Unicode)", -#else -#ifdef _UNICODE - "TabSRMM (Unicode)", #else "TabSRMM", -#endif -#endif #endif PLUGIN_MAKE_VERSION(_VER_MAJOR, _VER_MINOR, _VER_REVISION, _VER_BUILD), "IM and group chat module for Miranda IM.", diff --git a/plugins/TipperYM/tipper.cpp b/plugins/TipperYM/tipper.cpp index 062b5c87c9..3844e66758 100644 --- a/plugins/TipperYM/tipper.cpp +++ b/plugins/TipperYM/tipper.cpp @@ -52,15 +52,7 @@ int hLangpack; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), -#if defined (_UNICODE) - #if defined _WIN64 - "Tipper YM (Unicode x64)", - #else - "Tipper YM (Unicode)", - #endif -#else "Tipper YM", -#endif __VERSION_DWORD, "Tool Tip notification windows.", "Scott Ellis, yaho", diff --git a/plugins/TranslitSwitcher/Version.h b/plugins/TranslitSwitcher/Version.h index 794cba7490..5caf9999ac 100644 --- a/plugins/TranslitSwitcher/Version.h +++ b/plugins/TranslitSwitcher/Version.h @@ -10,15 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_NAME "Switch Layout or Transliterate (Unicode x64)" -#else - #define __PLUGIN_NAME "Switch Layout or Transliterate (Unicode)" -#endif -#else - #define __PLUGIN_NAME "Switch Layout or Transliterate" -#endif +#define __PLUGIN_NAME "Switch Layout or Transliterate" #define __INTERNAL_NAME "TranslitSwitcher" #define __FILENAME "TranslitSwitcher.dll" #define __DESCRIPTION "Allows to switch a layout or transliterate or invert case of the entered text in the message window with SmileyAdd support." diff --git a/plugins/Updater/version.h b/plugins/Updater/version.h index 84ba6d103e..f1478db69a 100644 --- a/plugins/Updater/version.h +++ b/plugins/Updater/version.h @@ -17,15 +17,7 @@ #define __AUTHOREMAIL "mail@scottellis.com.au" #define __COPYRIGHT "© 2005,2006 Scott Ellis, 2009-2011 Boris Krasnovskiy" #define __AUTHORWEB "http://www.scottellis.com.au" - -#if defined(_WIN64) -#define __PLUGIN_NAME "Updater x64" -#elif defined(_UNICODE) -#define __PLUGIN_NAME "Updater (Unicode)" -#else -#define __PLUGIN_NAME "Updater (ANSI)" -#endif - +#define __PLUGIN_NAME "Updater" #define __FILENAME "updater.dll" diff --git a/plugins/UserInfoEx/Res/version.h b/plugins/UserInfoEx/Res/version.h index 4f0993d127..5ba38222dd 100644 --- a/plugins/UserInfoEx/Res/version.h +++ b/plugins/UserInfoEx/Res/version.h @@ -45,20 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __COPYRIGHT "© 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol" #define __AUTHORWEB "http://addons.miranda-im.org/details.php?action=viewfile&id=" __STRINGIFY(__UPDATER_DOWNLOAD_ID) -#ifdef _WIN64 - #ifdef _UNICODE - #define __UPDATER_DOWNLOAD_ID 3333 - #define __PLUGIN_DISPLAY_NAME "UserInfoEx x64 (Unicode)" - #define __PLUGIN_FILENAME "uinfoexw.dll" - #endif -#else - #ifdef _UNICODE - #define __UPDATER_DOWNLOAD_ID 2537 - #define __PLUGIN_DISPLAY_NAME "UserInfoEx (Unicode)" //ensure plugin shortName matches file listing! UserInfoEx (Unicode) - #define __PLUGIN_FILENAME "uinfoexw.dll" - #else - #define __UPDATER_DOWNLOAD_ID 1971 - #define __PLUGIN_DISPLAY_NAME "UserInfoEx" //ensure plugin shortName matches file listing! UserInfoEx - #define __PLUGIN_FILENAME "uinfoex.dll" - #endif -#endif +#define __UPDATER_DOWNLOAD_ID 2537 +#define __PLUGIN_DISPLAY_NAME "UserInfoEx" +#define __PLUGIN_FILENAME "uinfoex.dll" + \ No newline at end of file diff --git a/plugins/Variables/main.cpp b/plugins/Variables/main.cpp index 06d830259c..5cdd4c105c 100644 --- a/plugins/Variables/main.cpp +++ b/plugins/Variables/main.cpp @@ -59,15 +59,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), -#ifdef _WIN64 - "Variables (x64, Unicode)", -#else -#ifdef UNICODE - "Variables (Unicode)", -#else "Variables", -#endif -#endif __VERSION_DWORD, "Adds support for dynamic variables in strings for plugins.", "P Boon", diff --git a/plugins/WhenWasIt/version.h b/plugins/WhenWasIt/version.h index 022bb80385..6432734a24 100644 --- a/plugins/WhenWasIt/version.h +++ b/plugins/WhenWasIt/version.h @@ -39,15 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOREMAIL "eblis102@yahoo.com" #define __COPYRIGHT "© 2006-2011 Cristian Libotean" #define __AUTHORWEB "http://www.miranda-im.org/" +#define __PLUGIN_DISPLAY_NAME "WhenWasIt birthday reminder" -#ifdef _UNICODE -#if defined(WIN64) || defined(_WIN64) - #define __PLUGIN_DISPLAY_NAME "WhenWasIt birthday reminder (Unicode) (x64)" -#else - #define __PLUGIN_DISPLAY_NAME "WhenWasIt birthday reminder (Unicode)" -#endif -#else - #define __PLUGIN_DISPLAY_NAME "WhenWasIt birthday reminder" -#endif #endif //M_WWI_VERSION_H diff --git a/plugins/YAPP/version.h b/plugins/YAPP/version.h index e416b76c9c..4118cc9091 100644 --- a/plugins/YAPP/version.h +++ b/plugins/YAPP/version.h @@ -17,11 +17,7 @@ #define __COPYRIGHT "© 2005,2006 Scott Ellis" #define __AUTHORWEB "http://www.scottellis.com.au" -#ifdef _WIN64 -#define __PLUGIN_NAME "YAPP x64" -#else -#define __PLUGIN_NAME "YAPP" -#endif +#define __PLUGIN_NAME "YAPP" #define __FILENAME "yapp.dll" diff --git a/plugins/ZeroNotification/version.h b/plugins/ZeroNotification/version.h index 0c06f4da3b..a334eec318 100644 --- a/plugins/ZeroNotification/version.h +++ b/plugins/ZeroNotification/version.h @@ -3,17 +3,11 @@ #define VER_RELEASE 0 #define VER_BUILD 5 -#define PLUGINNAME_SHORT "ZeroNotify" -#if defined(_WIN64) - #define PLUGINNAME "Zero Notifications (x64)" -#elif defined(_UNICODE) - #define PLUGINNAME "Zero Notifications (Unicode)" -#else - #define PLUGINNAME "Zero Notifications" -#endif -#define DESCRIPTION "Adds options to automatically disable notifications when a protocol is in a certain status." -#define AUTHOR "bidyut (<0.0.0.5), Maat" -#define COPYRIGHT "© 2005 bidyut, © 2009 Maat" +#define PLUGINNAME_SHORT "ZeroNotify" +#define PLUGINNAME "Zero Notifications" +#define DESCRIPTION "Adds options to automatically disable notifications when a protocol is in a certain status." +#define AUTHOR "bidyut (<0.0.0.5), Maat" +#define COPYRIGHT "© 2005 bidyut, © 2009 Maat" // {47D489D3-310D-4ef6-BD05-699FFFD5A4AA} #define UID { 0x47d489d3, 0x310d, 0x4ef6, { 0xbd, 0x5, 0x69, 0x9f, 0xff, 0xd5, 0xa4, 0xaa } } diff --git a/plugins/mTextControl/src/version.h b/plugins/mTextControl/src/version.h index 59e8525d63..863d7bb32f 100644 --- a/plugins/mTextControl/src/version.h +++ b/plugins/mTextControl/src/version.h @@ -31,13 +31,10 @@ Last change by : $Author$ #define MODULNAME "MTextControl" //DB modul for this plugin #define MODULTITLE "Text Display" - #ifdef _UNICODE - #define MTEXT_DISPLAYNAME "Miranda Text Control (Unicode)" - #define MTEXT_FILENAME "mtextcontrolW.dll" - #else - #define MTEXT_DISPLAYNAME "Miranda Text Control (Ansi)" - #define MTEXT_FILENAME "mtextcontrol.dll" - #endif + + #define MTEXT_DISPLAYNAME "Miranda Text Control" + #define MTEXT_FILENAME "mtextcontrol.dll" + #define __MAJOR_VERSION 0 #define __MINOR_VERSION 8 #define __RELEASE_NUM 0 -- cgit v1.2.3