summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/modules.cpp1
-rw-r--r--src/modules/clist/clistmod.cpp4
-rw-r--r--src/modules/clist/clui.cpp3
-rw-r--r--src/modules/database/dbintf.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index 645f238872..0a2a77c012 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -54,7 +54,6 @@ int LoadSkinSounds(void);
int LoadSkinHotkeys(void);
int LoadUserInfoModule(void); // ui: user info
int LoadVisibilityModule(void); // ui: visibility control
-int LoadCLUIModule(void); // ui: CList UI
int LoadPluginOptionsModule(void); // ui: plugin viewer
int LoadAddContactModule(void); // ui: authcontrol contacts
int LoadUtilsModule(void); // ui: utils (has a few window classes, like HyperLink)
diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 7c8d7527d7..375b80367f 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -34,6 +34,7 @@ int ContactDeleted(WPARAM wParam, LPARAM lParam);
INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam);
INT_PTR InvalidateDisplayName(WPARAM wParam, LPARAM lParam);
int InitGroupServices(void);
+void LoadCluiServices();
INT_PTR Docking_IsDocked(WPARAM wParam, LPARAM lParam);
void InitDisplayNameCache(void);
void FreeDisplayNameCache(void);
@@ -500,9 +501,12 @@ int LoadContactListModule2(void)
HookEvent(ME_DB_CONTACT_ADDED, ContactAdded);
HookEvent(ME_DB_CONTACT_DELETED, ContactDeleted);
hProtoAckHook = (HANDLE) HookEvent(ME_PROTO_ACK, ProtocolAck);
+
hContactDoubleClicked = CreateHookableEvent(ME_CLIST_DOUBLECLICKED);
hContactIconChangedEvent = CreateHookableEvent(ME_CLIST_CONTACTICONCHANGED);
+ LoadCluiServices();
+
CreateServiceFunction(MS_CLIST_CONTACTDOUBLECLICKED, ContactDoubleClicked);
CreateServiceFunction(MS_CLIST_CONTACTFILESDROPPED, ContactFilesDropped);
CreateServiceFunction(MS_CLIST_GETSTATUSMODEDESCRIPTION, GetStatusModeDescription);
diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 04e7fe9b3a..45b38ccdc6 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -36,8 +36,6 @@ UINT uMsgProcessProfile;
#define M_RESTORESTATUS (WM_USER+7)
-void LoadCluiServices();
-
typedef struct {
int showsbar;
int showgrip;
@@ -275,7 +273,6 @@ int LoadCLUIModule(void)
hContactDraggingEvent = CreateHookableEvent(ME_CLUI_CONTACTDRAGGING);
hContactDroppedEvent = CreateHookableEvent(ME_CLUI_CONTACTDROPPED);
hContactDragStopEvent = CreateHookableEvent(ME_CLUI_CONTACTDRAGSTOP);
- LoadCluiServices();
WNDCLASSEX wndclass;
wndclass.cbSize = sizeof(wndclass);
diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp
index 61b737a780..6c6371e6ec 100644
--- a/src/modules/database/dbintf.cpp
+++ b/src/modules/database/dbintf.cpp
@@ -41,7 +41,7 @@ static INT_PTR srvGetContactCount(WPARAM, LPARAM)
}
///////////////////////////////////////////////////////////////////////////////
-// Events
+// Contacts
static INT_PTR srvFindFirstContact(WPARAM, LPARAM lParam)
{ return (currDb) ? (INT_PTR)currDb->FindFirstContact((LPCSTR)lParam) : 0;