From 2df859e61f17e64764c988df9db23ef8140ebf90 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 17 Jun 2012 16:23:48 +0000 Subject: cosmetic settings fix git-svn-id: http://svn.miranda-ng.org/main/trunk@463 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/hdr/modern_commonheaders.h | 1 + plugins/Clist_modern/init.cpp | 4 ++-- plugins/Clist_modern/modern_keyboard.cpp | 11 ++++++----- plugins/Clist_modern/version.h | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/plugins/Clist_modern/hdr/modern_commonheaders.h b/plugins/Clist_modern/hdr/modern_commonheaders.h index 9dda706e1a..65f3b20fae 100644 --- a/plugins/Clist_modern/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/hdr/modern_commonheaders.h @@ -180,6 +180,7 @@ extern int __cdecl mir_strcmp (const char *a, const char *b); extern int __cdecl mir_strlen (const char *a); extern int __cdecl mir_strcmpi(const char *a, const char *b); extern int __cdecl mir_tstrcmpi(const TCHAR *a, const TCHAR *b); +extern BOOL __cdecl mir_bool_tstrcmpi(const TCHAR *a, const TCHAR *b); extern DWORD exceptFunction(LPEXCEPTION_POINTERS EP); extern HANDLE ModernHookEvent( char *EventID, MIRANDAHOOK HookProc ); diff --git a/plugins/Clist_modern/init.cpp b/plugins/Clist_modern/init.cpp index 7ca3ed79ab..1587656eb8 100644 --- a/plugins/Clist_modern/init.cpp +++ b/plugins/Clist_modern/init.cpp @@ -62,12 +62,12 @@ __forceinline int MakeVer(int a, int b, int c, int d) PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - DEBUG_AWARE_STR "Modern Contact List '09", + "Modern Contact List", MakeVer(PRODUCT_VERSION), "Display contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation.", "Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven", "ashpynov@gmail.com" , - "Copyright 2000-2010 Miranda-IM project ["__DATE__" "__TIME__"]", + "Copyright 2000-2010 Miranda-IM project", "http://miranda-im.org/development", UNICODE_AWARE, DEFMOD_CLISTALL, diff --git a/plugins/Clist_modern/modern_keyboard.cpp b/plugins/Clist_modern/modern_keyboard.cpp index abc97debab..2bcd0a373f 100644 --- a/plugins/Clist_modern/modern_keyboard.cpp +++ b/plugins/Clist_modern/modern_keyboard.cpp @@ -34,7 +34,7 @@ INT_PTR hkCloseMiranda(WPARAM wParam,LPARAM lParam) INT_PTR hkRestoreStatus(WPARAM wParam,LPARAM lParam) { int nStatus = ModernGetSettingWord(NULL, "CList", "Status", ID_STATUS_OFFLINE); - CallService(MS_CLIST_SETSTATUSMODE, nStatus, 0); + CallService(MS_CLIST_SETSTATUSMODE, nStatus, 0); return 0; } @@ -46,17 +46,18 @@ int InitSkinHotKeys(void) HOTKEYDESC shk = {0}; shk.cbSize=sizeof(shk); + shk.dwFlags=HKD_TCHAR; - shk.pszDescription=LPGEN("Close Miranda"); + shk.ptszDescription=LPGENT("Close Miranda"); shk.pszName="CloseMiranda"; - shk.pszSection=LPGEN("Main"); + shk.ptszSection=LPGENT("Main"); shk.pszService="CLIST/HK/CloseMiranda"; shk.DefHotKey=0; CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); - shk.pszDescription=LPGEN("Restore last status"); + shk.ptszDescription=LPGENT("Restore last status"); shk.pszName="RestoreLastStatus"; - shk.pszSection=LPGEN("Status"); + shk.ptszSection=LPGENT("Status"); shk.pszService="CLIST/HK/RestoreStatus"; shk.DefHotKey=0; CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); diff --git a/plugins/Clist_modern/version.h b/plugins/Clist_modern/version.h index 21d3c8e694..73152f4f57 100644 --- a/plugins/Clist_modern/version.h +++ b/plugins/Clist_modern/version.h @@ -8,14 +8,8 @@ #define MINIMAL_COREVERSION 0, 9, 0, 0 #define MINIMAL_COREVERSION_STR "0, 9, 0, 0 " -#ifdef DEBUG -#define DEBUG_AWARE_STR "Debug " -#else -#define DEBUG_AWARE_STR "" -#endif - #define FILE_VERSION COREVERSION_NUM BUILD_NUM -#define FILE_VERSION_STR COREVERSION_NUM_STR DEBUG_AWARE_STR " build " BUILD_NUM_STR " " +#define FILE_VERSION_STR COREVERSION_NUM_STR " build " BUILD_NUM_STR " " #define PRODUCT_VERSION FILE_VERSION #define PRODUCT_VERSION_STR FILE_VERSION_STR -- cgit v1.2.3