From 2b982f8a1f23ae29136f62fb3819df50c281e19f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Mar 2013 21:53:08 +0000 Subject: rest of minor TopToolbar_AddButton issues git-svn-id: http://svn.miranda-ng.org/main/trunk@3981 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/src/alarms.cpp | 2 - plugins/Console/src/Console.cpp | 22 ++++---- plugins/CrashDumper/src/crshdmp.cpp | 46 ++++++++--------- plugins/DbEditorPP/src/main.cpp | 25 ++++----- plugins/ListeningTo/src/listeningto.cpp | 4 +- plugins/NewsAggregator/Src/Services.cpp | 19 ++++--- plugins/OpenFolder/src/openFolder.cpp | 13 +++-- plugins/RecentContacts/src/RecentContacts.cpp | 13 +++-- plugins/SimpleStatusMsg/src/main.cpp | 3 +- plugins/Weather/src/weather.cpp | 19 ++++--- plugins/WhenWasIt/src/hooked_events.cpp | 73 +++++++++++++-------------- plugins/WhenWasIt/src/hooked_events.h | 5 -- plugins/YAMN/src/services.cpp | 2 +- 13 files changed, 111 insertions(+), 135 deletions(-) diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index c447730f7b..2014f0f016 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -172,8 +172,6 @@ static int InitTopToolbarButton(WPARAM wParam, LPARAM lParam) ttb.dwFlags = TTBBF_VISIBLE; ttb.name = ttb.pszTooltipUp = LPGEN("Set Alarm"); hTopToolbarButton = TopToolbar_AddButton(&ttb); - - CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTopToolbarButton, (LPARAM)TTBST_RELEASED); return 0; } diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index b3096178e6..89e2190778 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -126,19 +126,15 @@ static int OnTTBLoaded(WPARAM wParam,LPARAM lParam) Icon_Register(hInst, "Console", iconList, SIZEOF(iconList)); - TTBButton ttbb = { 0 }; - ttbb.cbSize = sizeof(ttbb); - ttbb.hIconHandleUp = iconList[0].hIcolib; - ttbb.hIconHandleDn = iconList[1].hIcolib; - ttbb.dwFlags = (state ? TTBBF_PUSHED : 0) | TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.pszService = MS_CONSOLE_SHOW_HIDE; - ttbb.name = LPGEN("Show/Hide Console"); - ttbb.pszTooltipDn = LPGEN("Hide Console"); - ttbb.pszTooltipUp = LPGEN("Show Console"); - hTTBButt = TopToolbar_AddButton(&ttbb); - if (hTTBButt) - CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTBButt, (LPARAM)(state?TTBST_PUSHED:TTBST_RELEASED)); - + TTBButton ttb = { sizeof(ttb) }; + ttb.hIconHandleUp = iconList[0].hIcolib; + ttb.hIconHandleDn = iconList[1].hIcolib; + ttb.dwFlags = (state ? TTBBF_PUSHED : 0) | TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; + ttb.pszService = MS_CONSOLE_SHOW_HIDE; + ttb.name = LPGEN("Show/Hide Console"); + ttb.pszTooltipDn = LPGEN("Hide Console"); + ttb.pszTooltipUp = LPGEN("Show Console"); + hTTBButt = TopToolbar_AddButton(&ttb); return 0; } diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 7d2af2bc90..d01e364ee3 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -202,30 +202,28 @@ int OptionsInit(WPARAM wParam, LPARAM) static int ToolbarModulesLoaded(WPARAM, LPARAM) { - TTBButton tbb = {0}; - tbb.cbSize = sizeof(TTBButton); - - tbb.pszService = MS_CRASHDUMPER_STORETOCLIP; - tbb.name = tbb.pszTooltipUp = LPGEN("Version Information To Clipboard"); - tbb.hIconHandleUp = GetIconHandle(IDI_VITOCLIP); - tbb.dwFlags = TTBBF_VISIBLE; - TopToolbar_AddButton(&tbb); - - tbb.pszService = MS_CRASHDUMPER_STORETOFILE; - tbb.name = tbb.pszTooltipUp = LPGEN("Version Information To File"); - tbb.hIconHandleUp = GetIconHandle(IDI_VITOFILE); - tbb.dwFlags = 0; - TopToolbar_AddButton(&tbb); - - tbb.pszService = MS_CRASHDUMPER_VIEWINFO; - tbb.name = tbb.pszTooltipUp = LPGEN("Show Version Information"); - tbb.hIconHandleUp = GetIconHandle(IDI_VISHOW); - TopToolbar_AddButton(&tbb); - - tbb.pszService = MS_CRASHDUMPER_UPLOAD; - tbb.name = tbb.pszTooltipUp = LPGEN("Upload Version Information"); - tbb.hIconHandleUp = GetIconHandle(IDI_VIUPLOAD); - TopToolbar_AddButton(&tbb); + TTBButton ttb = { sizeof(ttb) }; + ttb.pszService = MS_CRASHDUMPER_STORETOCLIP; + ttb.name = ttb.pszTooltipUp = LPGEN("Version Information To Clipboard"); + ttb.hIconHandleUp = GetIconHandle(IDI_VITOCLIP); + ttb.dwFlags = TTBBF_VISIBLE; + TopToolbar_AddButton(&ttb); + + ttb.pszService = MS_CRASHDUMPER_STORETOFILE; + ttb.name = ttb.pszTooltipUp = LPGEN("Version Information To File"); + ttb.hIconHandleUp = GetIconHandle(IDI_VITOFILE); + ttb.dwFlags = 0; + TopToolbar_AddButton(&ttb); + + ttb.pszService = MS_CRASHDUMPER_VIEWINFO; + ttb.name = ttb.pszTooltipUp = LPGEN("Show Version Information"); + ttb.hIconHandleUp = GetIconHandle(IDI_VISHOW); + TopToolbar_AddButton(&ttb); + + ttb.pszService = MS_CRASHDUMPER_UPLOAD; + ttb.name = ttb.pszTooltipUp = LPGEN("Upload Version Information"); + ttb.hIconHandleUp = GetIconHandle(IDI_VIUPLOAD); + TopToolbar_AddButton(&ttb); return 0; } diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index df3505c2e5..7bc8b290fa 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -12,7 +12,7 @@ HANDLE hUserMenu; HANDLE hRestore; WatchListArrayStruct WatchListArray; HANDLE sMenuCommand, sRegisterModule, sRegisterSingleModule, sImport, sServicemodeLaunch; -HANDLE hModulesLoadedHook = NULL, hSettingsChangedHook=NULL, hOptInitHook=NULL, hPreShutdownHook=NULL, hTTBHook = NULL; +HANDLE hModulesLoadedHook = NULL, hSettingsChangedHook=NULL, hOptInitHook=NULL, hPreShutdownHook=NULL; //======================== // MirandaPluginInfo @@ -141,17 +141,15 @@ BOOL IsCP_UTF8(void) static int OnTTBLoaded(WPARAM wParam,LPARAM lParam) { - TTBButton ttbb = {0}; HICON ico = LoadIcon(hInst, MAKEINTRESOURCE(ICO_DBE_BUTT)); - UnhookEvent(hTTBHook); - - ttbb.cbSize = sizeof(ttbb); - ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.pszService = "DBEditorpp/MenuCommand"; - ttbb.name = LPGEN("Database Editor++"); - ttbb.hIconUp = ico; - ttbb.pszTooltipUp = LPGEN("Open Database Editor"); - hTTBButt = TopToolbar_AddButton(&ttbb); + + TTBButton ttb = { sizeof(ttb) }; + ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; + ttb.pszService = "DBEditorpp/MenuCommand"; + ttb.name = LPGEN("Database Editor++"); + ttb.hIconUp = ico; + ttb.pszTooltipUp = LPGEN("Open Database Editor"); + hTTBButt = TopToolbar_AddButton(&ttb); return 0; } @@ -175,8 +173,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) hUserMenu = Menu_AddContactMenuItem(&mi); // Register hotkeys - HOTKEYDESC hkd = {0}; - hkd.cbSize = sizeof(hkd); + HOTKEYDESC hkd = { sizeof(hkd) }; hkd.pszName = "hk_dbepp_open"; hkd.pszService = "DBEditorpp/MenuCommand"; hkd.ptszDescription = LPGEN("Open Database Editor"); @@ -235,7 +232,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) DBFreeVariant(&dbv); } - hTTBHook = HookEvent(ME_TTB_MODULELOADED, OnTTBLoaded); + HookEvent(ME_TTB_MODULELOADED, OnTTBLoaded); if ( bServiceMode ) CallService("DBEditorpp/MenuCommand",0,0); diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 1c4fbf699b..129bdce559 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -481,8 +481,7 @@ int TopToolBarLoaded(WPARAM wParam, LPARAM lParam) CreateServiceFunction(MS_LISTENINGTO_TTB, TopToolBarClick); - TTBButton ttb = {0}; - ttb.cbSize = sizeof(ttb); + TTBButton ttb = { sizeof(ttb) }; ttb.hIconHandleDn = iconList[0].hIcolib; ttb.hIconHandleUp = iconList[1].hIcolib; ttb.pszService = MS_LISTENINGTO_TTB; @@ -491,7 +490,6 @@ int TopToolBarLoaded(WPARAM wParam, LPARAM lParam) ttb.pszTooltipDn = LPGEN("Disable ListeningTo (to all protocols)"); ttb.pszTooltipUp = LPGEN("Enable ListeningTo (to all protocols)"); hTTB = TopToolbar_AddButton(&ttb); - return 0; } diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp index 682badbdda..ff12ebe2a4 100644 --- a/plugins/NewsAggregator/Src/Services.cpp +++ b/plugins/NewsAggregator/Src/Services.cpp @@ -287,15 +287,14 @@ INT_PTR EnableDisable(WPARAM wParam, LPARAM lParam) int OnToolbarLoaded(WPARAM wParam, LPARAM lParam) { - TTBButton tbb = {0}; - tbb.cbSize = sizeof(TTBButton); - tbb.name = LPGEN("Enable/disable auto update"); - tbb.pszService = MS_NEWSAGGREGATOR_ENABLED; - tbb.pszTooltipUp = LPGEN("Auto Update Enabled"); - tbb.pszTooltipDn = LPGEN("Auto Update Disabled"); - tbb.hIconHandleUp = GetIconHandle("enabled"); - tbb.hIconHandleDn = GetIconHandle("disabled"); - tbb.dwFlags = (db_get_b(NULL, MODULE, "AutoUpdate", 1) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; - hTBButton = TopToolbar_AddButton(&tbb); + TTBButton ttb = { sizeof(ttb) }; + ttb.name = LPGEN("Enable/disable auto update"); + ttb.pszService = MS_NEWSAGGREGATOR_ENABLED; + ttb.pszTooltipUp = LPGEN("Auto Update Enabled"); + ttb.pszTooltipDn = LPGEN("Auto Update Disabled"); + ttb.hIconHandleUp = GetIconHandle("enabled"); + ttb.hIconHandleDn = GetIconHandle("disabled"); + ttb.dwFlags = (db_get_b(NULL, MODULE, "AutoUpdate", 1) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; + hTBButton = TopToolbar_AddButton(&ttb); return 0; } \ No newline at end of file diff --git a/plugins/OpenFolder/src/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index e04d199764..ec6f3c90fa 100644 --- a/plugins/OpenFolder/src/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp @@ -46,13 +46,12 @@ static INT_PTR MenuCommand_OpenFolder(WPARAM wParam, LPARAM lParam) // toptoolbar (if plugin is installed) static int ToptoolBarHook(WPARAM wParam, LPARAM lParam) { - TTBButton ttbb = { 0 }; - ttbb.cbSize = sizeof( ttbb ); - ttbb.hIconHandleUp = icon.hIcolib; - ttbb.pszService = MS_OPENFOLDER_OPEN; - ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.name = LPGEN("Open Folder"); - TopToolbar_AddButton(&ttbb); + TTBButton ttb = { sizeof(ttb) }; + ttb.hIconHandleUp = icon.hIcolib; + ttb.pszService = MS_OPENFOLDER_OPEN; + ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; + ttb.name = LPGEN("Open Folder"); + TopToolbar_AddButton(&ttb); return 0; } diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 81fa8437f9..a2ea520d27 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -444,13 +444,12 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam) { - TTBButton ttbb = {0}; - ttbb.cbSize = sizeof(ttbb); - ttbb.hIconHandleUp = icon.hIcolib; - ttbb.pszService = msLastUC_ShowList; - ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.name = ttbb.pszTooltipUp = msLastUC_ShowListName; - hTopToolbarButtonShowList = TopToolbar_AddButton(&ttbb); + TTBButton ttb = { sizeof(ttb) }; + ttb.hIconHandleUp = icon.hIcolib; + ttb.pszService = msLastUC_ShowList; + ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; + ttb.name = ttb.pszTooltipUp = msLastUC_ShowListName; + hTopToolbarButtonShowList = TopToolbar_AddButton(&ttb); return 0; } diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 61328bad26..b534c8d0b3 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1592,8 +1592,7 @@ VOID CALLBACK UpdateMsgTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD d static int AddTopToolbarButton(WPARAM wParam, LPARAM lParam) { - TTBButton ttbb = {0}; - ttbb.cbSize = sizeof(ttbb); + TTBButton ttbb = { sizeof(ttbb) }; ttbb.hIconHandleUp = ttbb.hIconHandleDn = GetIconHandle(IDI_CSMSG); ttbb.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT; ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 17d873d482..fd110987e6 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -103,16 +103,15 @@ int WeatherShutdown(WPARAM wParam,LPARAM lParam) int OnToolbarLoaded(WPARAM wParam, LPARAM lParam) { - TTBButton tbb = {0}; - tbb.cbSize = sizeof(TTBButton); - tbb.name = LPGEN("Enable/disable auto update"); - tbb.pszService = MS_WEATHER_ENABLED; - tbb.pszTooltipUp = LPGEN("Auto Update Enabled"); - tbb.pszTooltipDn = LPGEN("Auto Update Disabled"); - tbb.hIconHandleUp = GetIconHandle("main"); - tbb.hIconHandleDn = GetIconHandle("disabled"); - tbb.dwFlags = (db_get_b(NULL, WEATHERPROTONAME, "AutoUpdate", 1) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; - hTBButton = TopToolbar_AddButton(&tbb); + TTBButton ttb = { sizeof(ttb) }; + ttb.name = LPGEN("Enable/disable auto update"); + ttb.pszService = MS_WEATHER_ENABLED; + ttb.pszTooltipUp = LPGEN("Auto Update Enabled"); + ttb.pszTooltipDn = LPGEN("Auto Update Disabled"); + ttb.hIconHandleUp = GetIconHandle("main"); + ttb.hIconHandleDn = GetIconHandle("disabled"); + ttb.dwFlags = (db_get_b(NULL, WEATHERPROTONAME, "AutoUpdate", 1) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; + hTBButton = TopToolbar_AddButton(&ttb); return 0; } diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index 2f646eaf6a..c15195a238 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -38,16 +38,40 @@ UINT_PTR hDateChangeTimer = NULL; int currentDay; -int HookEvents() +static int OnTopToolBarModuleLoaded(WPARAM wParam, LPARAM lParam) { - HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); - HookEvent(ME_OPT_INITIALISE, OnOptionsInitialise); + TTBButton ttb = { sizeof(ttb) }; + ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; + ttb.pszService = MS_WWI_CHECK_BIRTHDAYS; + ttb.hIconHandleUp = hCheckMenu; + ttb.name = ttb.pszTooltipUp = LPGEN("Check for birthdays"); + TopToolbar_AddButton(&ttb); return 0; } -int UnhookEvents() +static int OnOptionsInitialise(WPARAM wParam, LPARAM lParam) { - KillTimers(); + OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + odp.position = 100000000; + odp.hInstance = hInstance; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WWI); + odp.ptszTitle = LPGENT("Birthdays"); + odp.ptszGroup = LPGENT("Contacts"); + odp.groupPosition = 910000000; + odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; + odp.pfnDlgProc = DlgProcOptions; + Options_AddPage(wParam, &odp); + + return 0; +} + +static int OnContactSettingChanged(WPARAM wParam, LPARAM lParam) +{ + DBCONTACTWRITESETTING *dw = (DBCONTACTWRITESETTING *) lParam; + DBVARIANT dv = dw->value; + if ((strcmp(dw->szModule, DUMMY_MODULE) == 0) && (strcmp(dw->szSetting, DUMMY_SETTING) == 0)) + RefreshContactListIcons((HANDLE)wParam); + return 0; } @@ -100,8 +124,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) hmAddChangeBirthday = Menu_AddContactMenuItem(&cl); // Register hotkeys - HOTKEYDESC hotkey = {0}; - hotkey.cbSize = sizeof(hotkey); + HOTKEYDESC hotkey = { sizeof(hotkey) }; hotkey.ptszSection = LPGENT("Birthdays"); hotkey.dwFlags = HKD_TCHAR; @@ -118,44 +141,20 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) return 0; } -int OnTopToolBarModuleLoaded(WPARAM wParam, LPARAM lParam) +int HookEvents() { - TTBButton ttb = { sizeof(ttb) }; - ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttb.pszService = MS_WWI_CHECK_BIRTHDAYS; - ttb.hIconHandleUp = hCheckMenu; - ttb.name = ttb.pszTooltipUp = LPGEN("Check for birthdays"); - TopToolbar_AddButton(&ttb); + HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); + HookEvent(ME_OPT_INITIALISE, OnOptionsInitialise); return 0; } -int OnOptionsInitialise(WPARAM wParam, LPARAM lParam) +int UnhookEvents() { - OPTIONSDIALOGPAGE odp = {0}; - - odp.cbSize = sizeof(odp); - odp.position = 100000000; - odp.hInstance = hInstance; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WWI); - odp.ptszTitle = LPGENT("Birthdays"); - odp.ptszGroup = LPGENT("Contacts"); - odp.groupPosition = 910000000; - odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; - odp.pfnDlgProc = DlgProcOptions; - Options_AddPage(wParam, &odp); - + KillTimers(); return 0; } -int OnContactSettingChanged(WPARAM wParam, LPARAM lParam) -{ - DBCONTACTWRITESETTING *dw = (DBCONTACTWRITESETTING *) lParam; - DBVARIANT dv = dw->value; - if ((strcmp(dw->szModule, DUMMY_MODULE) == 0) && (strcmp(dw->szSetting, DUMMY_SETTING) == 0)) - RefreshContactListIcons((HANDLE)wParam); - - return 0; -} +///////////////////////////////////////////////////////////////////////////////////////// int RefreshContactListIcons(HANDLE hContact) { diff --git a/plugins/WhenWasIt/src/hooked_events.h b/plugins/WhenWasIt/src/hooked_events.h index 3b8ecc60ba..f33012a9e2 100644 --- a/plugins/WhenWasIt/src/hooked_events.h +++ b/plugins/WhenWasIt/src/hooked_events.h @@ -32,11 +32,6 @@ extern UINT_PTR hDateChangeTimer; int HookEvents(); int UnhookEvents(); -int OnModulesLoaded(WPARAM wParam, LPARAM lParam); -int OnTopToolBarModuleLoaded(WPARAM wParam, LPARAM lParam); -int OnOptionsInitialise(WPARAM wParam, LPARAM lParam); -int OnContactSettingChanged(WPARAM wParam, LPARAM lParam); - int UpdateTimers(); int KillTimers(); diff --git a/plugins/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp index e4a6faedf9..36716453b0 100644 --- a/plugins/YAMN/src/services.cpp +++ b/plugins/YAMN/src/services.cpp @@ -352,7 +352,7 @@ int SystemModulesLoaded(WPARAM, LPARAM); //in main.cpp typedef struct { HANDLE hookHandle; const char *hookName; MIRANDAHOOK mirandaFunction;} HookDataType; static HookDataType hookData[] = { {0, ME_SYSTEM_MODULESLOADED, SystemModulesLoaded}, //pop3 plugin must be included after all miranda modules are loaded - {0, ME_TTB_MODULELOADED, AddTopToolbarIcon}, + {0, ME_TTB_MODULELOADED, AddTopToolbarIcon}, {0, ME_OPT_INITIALISE, YAMNOptInitSvc}, {0, ME_SYSTEM_PRESHUTDOWN, Shutdown}, {0, ME_CLIST_DOUBLECLICKED, Service_ContactDoubleclicked}, -- cgit v1.2.3