From 425f1b7f87d7599589252545156f0b993b55825f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 14 Jan 2014 22:13:20 +0000 Subject: more garbage cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@7659 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/chat/chat.h | 2 -- src/modules/chat/chat_svc.cpp | 21 ++------------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'src/modules/chat') diff --git a/src/modules/chat/chat.h b/src/modules/chat/chat.h index ec52412a5a..c93abd8d88 100644 --- a/src/modules/chat/chat.h +++ b/src/modules/chat/chat.h @@ -19,7 +19,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include #include #include @@ -33,7 +32,6 @@ struct GCPTRS }; extern HGENMENU hJoinMenuItem, hLeaveMenuItem; -extern BOOL PopupInstalled; // log.c void LoadMsgLogBitmaps(void); diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp index 453bcf1d07..87b01ee537 100644 --- a/src/modules/chat/chat_svc.cpp +++ b/src/modules/chat/chat_svc.cpp @@ -26,7 +26,6 @@ INT_PTR SvcGetChatManager(WPARAM, LPARAM); #include "chat.h" -BOOL SmileyAddInstalled, PopupInstalled, IEviewInstalled; HGENMENU hJoinMenuItem, hLeaveMenuItem; CRITICAL_SECTION cs; @@ -447,8 +446,7 @@ static INT_PTR Service_AddEvent(WPARAM wParam, LPARAM lParam) case GC_EVENT_ACTION: if (!gce->bIsMe && gce->pDest->ptszID && gce->ptszText) { SESSION_INFO *si = ci.SM_FindSession(gce->pDest->ptszID, gce->pDest->pszModule); - if (si) - if (IsHighlighted(si, gce->ptszText)) + if (si && IsHighlighted(si, gce->ptszText)) bIsHighlighted = TRUE; } break; @@ -530,13 +528,6 @@ static INT_PTR Service_GetAddEventPtr(WPARAM wParam, LPARAM lParam) return 0; } -static int ModuleLoad(WPARAM wParam, LPARAM lParam) -{ - IEviewInstalled = ServiceExists(MS_IEVIEW_WINDOW); - PopupInstalled = ServiceExists(MS_POPUP_ADDPOPUP); - return 0; -} - static int ModulesLoaded(WPARAM wParam, LPARAM lParam) { char* mods[3] = { "Chat", "ChatFonts" }; @@ -562,13 +553,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) HookEvent(ME_FONT_RELOAD, FontsChanged); HookEvent(ME_SKIN2_ICONSCHANGED, IconsChanged); - - if (ServiceExists(MS_SMILEYADD_SHOWSELECTION)) { - SmileyAddInstalled = TRUE; - HookEvent(ME_SMILEYADD_OPTIONSCHANGED, SmileyOptionsChanged); - } - - ModuleLoad(0, 0); + HookEvent(ME_SMILEYADD_OPTIONSCHANGED, SmileyOptionsChanged); ci.SetAllOffline(TRUE, NULL); return 0; @@ -595,8 +580,6 @@ void LoadChatModule(void) HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu); HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown); HookEvent(ME_SKIN_ICONSCHANGED, IconsChanged); - HookEvent(ME_SYSTEM_MODULELOAD, ModuleLoad); - HookEvent(ME_SYSTEM_MODULEUNLOAD, ModuleLoad); CreateServiceFunction(MS_GC_REGISTER, Service_Register); CreateServiceFunction(MS_GC_NEWSESSION, Service_NewChat); -- cgit v1.2.3