summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--protocols/JabberG/jabber.cpp3
-rw-r--r--protocols/JabberG/jabber_menu.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/protocols/JabberG/jabber.cpp b/protocols/JabberG/jabber.cpp
index 9c687789b3..99b3ce796b 100644
--- a/protocols/JabberG/jabber.cpp
+++ b/protocols/JabberG/jabber.cpp
@@ -151,6 +151,8 @@ static INT_PTR g_SvcParseXmppUri(WPARAM w, LPARAM l)
static int OnModulesLoaded( WPARAM, LPARAM )
{
+ hModulesLoadedTB = HookEvent(ME_TTB_MODULELOADED, g_OnToolbarInit);
+
bSecureIM = (ServiceExists("SecureIM/IsContactSecured"));
// file associations manager plugin support
@@ -258,7 +260,6 @@ extern "C" int __declspec( dllexport ) Load()
g_IconsInit();
g_MenuInit();
hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
- hModulesLoadedTB = HookEvent(ME_TTB_MODULELOADED, g_OnToolbarInit);
JabberUserInfoInit();
return 0;
diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/jabber_menu.cpp
index 0415b0a8ce..cc5c18b9ae 100644
--- a/protocols/JabberG/jabber_menu.cpp
+++ b/protocols/JabberG/jabber_menu.cpp
@@ -981,7 +981,7 @@ int g_OnToolbarInit(WPARAM, LPARAM)
TTBButton button = {0};
button.cbSize = sizeof(button);
- button.dwFlags = TTBBF_SHOWTOOLTIP|TTBBF_VISIBLE;
+ button.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE | TTBBF_ICONBYHANDLE;
List_InsertPtr( &arServices, CreateServiceFunction("JABBER/*/Groupchat", g_ToolbarHandleJoinGroupchat ));
button.pszService = "JABBER/*/Groupchat";