From e101f83e1e4ba4a9d473a9bc74ca88c9a8e73f36 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 11 Jul 2012 11:47:10 +0000 Subject: valid registration of toolbar's icons for Jabber git-svn-id: http://svn.miranda-ng.org/main/trunk@901 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/jabber.cpp | 3 ++- protocols/JabberG/jabber_menu.cpp | 2 +- 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"; -- cgit v1.2.3