diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-23 13:04:28 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-23 13:04:28 +0000 |
| commit | 4ba9c10fa00482b9e9d8b54812b49ecf60cee95e (patch) | |
| tree | 60a4eaf0406288ae2ccda66beccbff7a1b6126b4 /protocols/JabberG | |
| parent | 7d3d5e16b4e5378a751576095771c2a75b7276fb (diff) | |
obsoleted constants CMIF_ROOTPOPUP & CMIF_CHILDPOPUP replaced with CMIF_ROOTHANDLE
git-svn-id: http://svn.miranda-ng.org/main/trunk@14350 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 10 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_privacy.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 58e54e1297..42d1c744d5 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -422,7 +422,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) char* tDest = text + nModuleNameLength;
CLISTMENUITEM mi = { 0 };
- mi.flags = CMIF_CHILDPOPUP;
+ mi.flags = CMIF_ROOTHANDLE;
mi.position = 0;
mi.icolibItem = NULL;
mi.pszService = text;
@@ -598,7 +598,7 @@ void CJabberProto::MenuInit() mi.ptszName = m_tszUserName;
mi.position = -1999901006;
mi.hParentMenu = HGENMENU_ROOT;
- mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+ mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
mi.icolibItem = m_hProtoIcon;
hJabberRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);
}
@@ -611,7 +611,7 @@ void CJabberProto::MenuInit() // "Bookmarks..."
CreateProtoService("/Bookmarks", &CJabberProto::OnMenuHandleBookmarks);
mir_strcpy(tDest, "/Bookmarks");
- mi.flags = CMIF_CHILDPOPUP;
+ mi.flags = CMIF_ROOTHANDLE;
mi.hParentMenu = hJabberRoot;
mi.pszName = LPGEN("Bookmarks");
mi.position = 200001;
@@ -708,7 +708,7 @@ void CJabberProto::MenuInit() mi.pszContactOwner = m_szModuleName;
mi.hParentMenu = hJabberRoot;
mi.pszName = LPGEN("Resource priority");
- mi.flags = CMIF_ROOTPOPUP | CMIF_HIDDEN;
+ mi.flags = CMIF_ROOTHANDLE | CMIF_HIDDEN;
m_hMenuPriorityRoot = Menu_AddProtoMenuItem(&mi);
TCHAR szName[128];
@@ -716,7 +716,7 @@ void CJabberProto::MenuInit() mi.pszService = srvFce;
mi.ptszName = szName;
mi.position = 2000040000;
- mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+ mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
mi.hParentMenu = m_hMenuPriorityRoot;
mir_snprintf(srvFce, _countof(srvFce), "%s/menuSetPriority/0", m_szModuleName);
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 1e3382f92d..569797413b 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -2094,7 +2094,7 @@ void CJabberProto::BuildPrivacyMenu() mi.position = 200005;
mi.pszContactOwner = m_szModuleName;
mi.icolibItem = GetIconHandle(IDI_AGENTS);
- mi.flags = CMIF_ROOTPOPUP | CMIF_CHILDPOPUP | CMIF_HIDDEN;
+ mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_HIDDEN;
mi.pszName = LPGEN("Privacy Lists");
mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);
m_hPrivacyMenuRoot = Menu_AddProtoMenuItem(&mi);
@@ -2104,7 +2104,7 @@ void CJabberProto::BuildPrivacyMenu() mir_snprintf(srvFce, _countof(srvFce), "%s/PrivacyLists", m_szModuleName);
mi.pszService = srvFce;
mi.position = 3000040000;
- mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;
+ mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
mi.icolibItem = GetIconHandle(IDI_PRIVACY_LISTS);
mi.ptszName = LPGENT("List Editor...");
mi.hParentMenu = m_hPrivacyMenuRoot;
@@ -2125,7 +2125,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld) CLISTMENUITEM mi = { 0 };
mi.position = 2000040000;
- mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;
+ mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
mi.hParentMenu = m_hPrivacyMenuRoot;
mi.pszService = srvFce;
|