diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-30 20:27:23 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-30 20:27:23 +0000 |
| commit | a8c93cfbf235c31cf604cb6bd40009e9bf88f36a (patch) | |
| tree | 0eaf9592ee3cd752e8f2d0273132de0004aa1f6e /protocols/Steam/src | |
| parent | 6b893bc94df93321a216ba62c3d56a6e08086e36 (diff) | |
- fix for the old perversion with manual protocol root calculation;
- protocol menu root is always created by the core;
- other minor problems with protocol menus in main menu went away
git-svn-id: http://svn.miranda-ng.org/main/trunk@14462 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Steam/src')
| -rw-r--r-- | protocols/Steam/src/steam_menus.cpp | 15 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_proto.cpp | 1 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_proto.h | 1 |
3 files changed, 1 insertions, 16 deletions
diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index d975b21872..be3282378a 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -96,22 +96,9 @@ int CSteamProto::PrebuildContactMenu(WPARAM wParam, LPARAM lParam) void CSteamProto::OnInitStatusMenu()
{
- HGENMENU hSteamRoot = Menu_GetProtocolRoot(m_szModuleName);
- if (!hSteamRoot) {
- CMenuItem mi;
- mi.name.t = m_tszUserName;
- mi.position = -1999901006;
- mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- hSteamRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);
- }
- else {
- Menu_RemoveItem(m_hMenuRoot);
- m_hMenuRoot = NULL;
- }
-
CMenuItem mi;
mi.flags = CMIF_TCHAR;
- mi.root = hSteamRoot;
+ mi.root = Menu_GetProtocolRoot(this);
// Show block list
mi.pszService = "/BlockList";
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index 2a626f5020..807d2a091d 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -12,7 +12,6 @@ CSteamProto::CSteamProto(const char* protoName, const TCHAR* userName) : m_hQueueThread = NULL; m_pollingConnection = NULL; m_hPollingThread = NULL; - m_hMenuRoot = NULL; // icons wchar_t filePath[MAX_PATH]; diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h index c254d43865..12e1cee5a2 100644 --- a/protocols/Steam/src/steam_proto.h +++ b/protocols/Steam/src/steam_proto.h @@ -160,7 +160,6 @@ protected: void OnMessageSent(const NETLIBHTTPREQUEST *response, void *arg);
// menus
- HGENMENU m_hMenuRoot;
static int hChooserMenu;
static HGENMENU contactMenuItems[CMI_MAX];
|