summaryrefslogtreecommitdiff
path: root/protocols/JabberG
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-10 12:45:32 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-10 12:45:32 +0000
commit6ac63284a8f93f977db66673727d4995a86764c4 (patch)
tree79d7e0b6744e1de21e6c01c0b0869be8927621a1 /protocols/JabberG
parent102a413497df49bd2af8ee0a1770718fa0ecfcc2 (diff)
various TTB initialization issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@3957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
-rw-r--r--protocols/JabberG/src/jabber_menu.cpp29
1 files changed, 14 insertions, 15 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 6341669e62..833753eb2b 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -948,27 +948,26 @@ int g_OnToolbarInit(WPARAM, LPARAM)
if (g_Instances.getCount() == 0)
return 0;
- TTBButton button = {0};
- button.cbSize = sizeof(button);
- button.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE;
+ TTBButton ttb = { sizeof(ttb) };
+ ttb.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE;
CreateServiceFunction("JABBER/*/Groupchat", g_ToolbarHandleJoinGroupchat);
- button.pszService = "JABBER/*/Groupchat";
- button.pszTooltipUp = button.name = LPGEN("Join conference");
- button.hIconHandleUp = g_GetIconHandle(IDI_GROUP);
- TopToolbar_AddButton(&button);
+ ttb.pszService = "JABBER/*/Groupchat";
+ ttb.pszTooltipUp = ttb.name = LPGEN("Join conference");
+ ttb.hIconHandleUp = g_GetIconHandle(IDI_GROUP);
+ TopToolbar_AddButton(&ttb);
CreateServiceFunction("JABBER/*/Bookmarks", g_ToolbarHandleBookmarks);
- button.pszService = "JABBER/*/Bookmarks";
- button.pszTooltipUp = button.name = LPGEN("Open bookmarks");
- button.hIconHandleUp = g_GetIconHandle(IDI_BOOKMARKS);
- TopToolbar_AddButton(&button);
+ ttb.pszService = "JABBER/*/Bookmarks";
+ ttb.pszTooltipUp = ttb.name = LPGEN("Open bookmarks");
+ ttb.hIconHandleUp = g_GetIconHandle(IDI_BOOKMARKS);
+ TopToolbar_AddButton(&ttb);
CreateServiceFunction("JABBER/*/ServiceDiscovery", g_ToolbarHandleServiceDiscovery);
- button.pszService = "JABBER/*/ServiceDiscovery";
- button.pszTooltipUp = button.name = LPGEN("Service discovery");
- button.hIconHandleUp = g_GetIconHandle(IDI_SERVICE_DISCOVERY);
- TopToolbar_AddButton(&button);
+ ttb.pszService = "JABBER/*/ServiceDiscovery";
+ ttb.pszTooltipUp = ttb.name = LPGEN("Service discovery");
+ ttb.hIconHandleUp = g_GetIconHandle(IDI_SERVICE_DISCOVERY);
+ TopToolbar_AddButton(&ttb);
return 0;
}