more accurate implementation of SRMM toolbar buttons

2 files changed, 11 insertions, 10 deletions

diff --git a/src/mir_app/src/file.cpp b/src/mir_app/src/file.cpp
index 5f1b5641c2..4b07474d29 100644
--- a/src/mir_app/src/file.cpp
+++ b/src/mir_app/src/file.cpp
@@ -142,16 +142,7 @@ static int SRFileModulesLoaded(WPARAM, LPARAM)
 	hSRFileMenuItem = Menu_AddContactMenuItem(&mi);
 	CreateServiceFunction(mi.pszService, SendFileCommand);
 
-	// SRMM toolbar button
-	BBButton bbd = {};
-	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_NOREADONLY;
-	bbd.dwButtonID = 1;
-	bbd.dwDefPos = 50;
-	bbd.hIcon = g_plugin.getIconHandle(IDI_ATTACH);
-	bbd.pszModuleName = SRFILEMODULE;
-	bbd.pwszTooltip = LPGENW("Send file");
-	g_plugin.addButton(&bbd);
-
+	// Event hooks
 	HookEvent(ME_MSG_BUTTONPRESSED, OnToolbarButtonPressed);
 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, SRFilePreBuildMenu);
 	HookEvent(ME_PROTO_ACK, SRFileProtoAck);
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp
index 1f7f2e0e9b..0298918c3d 100644
--- a/src/mir_app/src/srmm_toolbar.cpp
+++ b/src/mir_app/src/srmm_toolbar.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 #include "chat.h"

+#include "file.h"

 #include "skin.h"

 

 #define BB_MODULE_NAME "SRMM_Toolbar"

@@ -863,6 +864,7 @@ static int ConvertToolbarData(const char *szSetting, void*)
 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

+// predefined kernel buttons

 

 static int OnToolbarLoaded(WPARAM, LPARAM)

 {

@@ -875,6 +877,14 @@ static int OnToolbarLoaded(WPARAM, LPARAM)
 	bbd.pszModuleName = SRMM_MODULE;

 	bbd.pwszTooltip = LPGENW("Custom bbcodes");

 	g_plugin.addButton(&bbd);

+

+	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_NOREADONLY;

+	bbd.dwButtonID = 1;

+	bbd.dwDefPos = 50;

+	bbd.hIcon = g_plugin.getIconHandle(IDI_ATTACH);

+	bbd.pszModuleName = SRFILEMODULE;

+	bbd.pwszTooltip = LPGENW("Send file");

+	g_plugin.addButton(&bbd);

 	return 0;

 }