diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-04 20:00:15 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-04 20:00:15 +0000 |
| commit | a90a30ec3de18405777a992c37dc6dd476465cd8 (patch) | |
| tree | a6777cebe105fec742d171af6771955431aed894 | |
| parent | a1e783a12be8a16b780a78f74e0f399bed657d4c (diff) | |
code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@2194 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/BossKeyPlus/src/BossKey.cpp | 13 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/init.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/init.cpp | 8 | ||||
| -rw-r--r-- | protocols/FacebookRM/src/main.cpp | 1 | ||||
| -rw-r--r-- | protocols/Twitter/src/main.cpp | 1 |
5 files changed, 3 insertions, 26 deletions
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 551ec82a96..ac6b4c457c 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -751,14 +751,7 @@ int MirandaLoaded(WPARAM wParam,LPARAM lParam) HookEvent(ME_MSG_BUTTONPRESSED, TabsrmmButtonPressed);
pcli = (CLIST_INTERFACE *)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)g_hInstance);
-#if defined _DEBUG
- if (pcli == 0)
- {
- MessageBox(NULL,_T("Can't get CLIST_INTERFACE!"),_T("BossKey+"),MB_ICONERROR);
- return 1;
- }else
-#endif
- GetWindowThreadProcessId(pcli->hwndContactList,&g_dwMirandaPID);
+ GetWindowThreadProcessId(pcli->hwndContactList, &g_dwMirandaPID);
// let's create our secret window
// this is a cheap, cheap hack...
@@ -766,12 +759,10 @@ int MirandaLoaded(WPARAM wParam,LPARAM lParam) // if the calls aren't made from this context, they won't work
// using the window is a workaround to make this process do its work :)
// see notes
- WNDCLASS winclass = {0};
+ WNDCLASS winclass = {0};
winclass.lpfnWndProc = ListenWndProc;
winclass.hInstance = g_hInstance;
- //winclass.hIcon = LoadIcon(NULL,IDI_APPLICATION);
- //winclass.hCursor = LoadCursor(NULL,IDC_ARROW);
winclass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
winclass.lpszClassName = BOSSKEY_LISTEN_INFO;
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 646543297a..3ae2e98750 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -149,11 +149,7 @@ static HRESULT SubclassClistInterface() {
// get the contact list interface
pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)g_hInst);
- if ((INT_PTR)pcli == CALLSERVICE_NOTFOUND || pcli->version < 6 )
- {
- MessageBoxA( NULL, "This version of plugin requires Miranda IM " MINIMAL_COREVERSION_STR " or later", "Fatal error", MB_OK );
- return TRUE;
- }
+
// OVERLOAD CLIST INTERFACE FUNCTIONS
//
// Naming convention is:
diff --git a/plugins/Clist_mw/src/init.cpp b/plugins/Clist_mw/src/init.cpp index b6d6c80c77..deca38a9c3 100644 --- a/plugins/Clist_mw/src/init.cpp +++ b/plugins/Clist_mw/src/init.cpp @@ -157,14 +157,6 @@ extern "C" int __declspec(dllexport) CListInitialise() PreloadCLCModule();
pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)g_hInst);
- if ( (INT_PTR)pcli == CALLSERVICE_NOTFOUND ) {
-LBL_Error:
- MessageBoxA( NULL, "This version of plugin requires Miranda IM 0.8.0.9 or later", "Fatal error", MB_OK );
- return 1;
- }
- if ( pcli->version < 6 )
- goto LBL_Error;
-
pcli->pfnBuildGroupPopupMenu = BuildGroupPopupMenu;
pcli->pfnCalcEipPosition = CalcEipPosition;
pcli->pfnCheckCacheItem = CheckPDNCE;
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index 0ba94f5974..23e517d0fd 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -92,7 +92,6 @@ static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void)
{
-
mir_getLP(&pluginInfo);
pcli = reinterpret_cast<CLIST_INTERFACE*>( CallService(
diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp index c92e757597..244f0d094b 100644 --- a/protocols/Twitter/src/main.cpp +++ b/protocols/Twitter/src/main.cpp @@ -87,7 +87,6 @@ static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void)
{
-
mir_getLP(&pluginInfo);
pcli = reinterpret_cast<CLIST_INTERFACE*>( CallService(
|