From 4ba9c10fa00482b9e9d8b54812b49ecf60cee95e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 23 Jun 2015 13:04:28 +0000 Subject: 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 --- protocols/AimOscar/src/theme.cpp | 4 ++-- protocols/FacebookRM/src/theme.cpp | 8 ++++---- protocols/GTalkExt/src/menu.cpp | 2 +- protocols/Gadu-Gadu/src/gg.cpp | 2 +- protocols/IRCG/src/services.cpp | 4 ++-- protocols/JabberG/src/jabber_menu.cpp | 10 +++++----- protocols/JabberG/src/jabber_privacy.cpp | 6 +++--- protocols/MRA/src/Mra_menus.cpp | 6 +++--- protocols/MSN/src/msn_menu.cpp | 4 ++-- protocols/SkypeWeb/src/skype_menus.cpp | 4 ++-- protocols/Steam/src/steam_menus.cpp | 4 ++-- protocols/Tlen/src/tlen.cpp | 4 ++-- protocols/Tox/src/tox_menus.cpp | 4 ++-- protocols/VKontakte/src/vk_proto.cpp | 4 ++-- protocols/WhatsApp/src/theme.cpp | 4 ++-- protocols/Yahoo/src/services.cpp | 4 ++-- 16 files changed, 37 insertions(+), 37 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index f23004803d..d4ba6ebfea 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -216,7 +216,7 @@ void CAimProto::InitMainMenus(void) HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName); if (hRoot == NULL) { - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = GetIconHandle("aim"); mi.ptszName = m_tszUserName; mi.hParentMenu = HGENMENU_ROOT; @@ -233,7 +233,7 @@ void CAimProto::InitMainMenus(void) mi.pszService = service_name; mi.hParentMenu = hRoot; - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mir_snprintf(service_name, _countof(service_name), "%s%s", m_szModuleName, "/ManageAccount"); CreateProtoService("/ManageAccount", &CAimProto::ManageAccount); diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 7b7392e49d..1d371c61c7 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -220,7 +220,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) CLISTMENUITEM miRoot = { 0 }; miRoot.popupPosition = 500085000; miRoot.hParentMenu = HGENMENU_ROOT; - miRoot.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED); + miRoot.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED); miRoot.icolibItem = GetIconHandle("facebook"); miRoot.ptszName = m_tszUserName; hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&miRoot); @@ -231,7 +231,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) m_hMenuRoot = NULL; } - mi.flags = CMIF_CHILDPOPUP | (this->isOnline() ? 0 : CMIF_GRAYED); + mi.flags = CMIF_ROOTHANDLE | (this->isOnline() ? 0 : CMIF_GRAYED); mi.position = 201001; mi.hParentMenu = hRoot; @@ -243,7 +243,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) //CreateProtoService("/VisitProfile",&FacebookProto::VisitProfile); mir_strcpy(tDest, "/VisitProfile"); - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.pszName = LPGEN("Visit profile"); mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL); // TODO RM: remember and properly free in destructor? @@ -258,7 +258,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM) // Services... mi.pszName = LPGEN("Services..."); mir_strcpy(tDest, "/Services"); - mi.flags = CMIF_CHILDPOPUP | (this->isOnline() ? 0 : CMIF_GRAYED); + mi.flags = CMIF_ROOTHANDLE | (this->isOnline() ? 0 : CMIF_GRAYED); mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP); m_hMenuServicesRoot = Menu_AddProtoMenuItem(&mi); diff --git a/protocols/GTalkExt/src/menu.cpp b/protocols/GTalkExt/src/menu.cpp index db59455c4f..d6de671201 100644 --- a/protocols/GTalkExt/src/menu.cpp +++ b/protocols/GTalkExt/src/menu.cpp @@ -45,7 +45,7 @@ int InitMenus(WPARAM wParam, LPARAM lParam) CreateServiceFunctionParam(szServiceName, OpenMailboxMenuHandler, (LPARAM)szModuleName); CLISTMENUITEM cmi = { 0 }; - cmi.flags = CMIF_CHILDPOPUP; + cmi.flags = CMIF_ROOTHANDLE; cmi.hParentMenu = HGENMENU(wParam); cmi.hIcon = g_hPopupIcon; cmi.position = 200101; diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 1cfffa77ee..0712ed4784 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -270,7 +270,7 @@ void GGPROTO::menus_init() mi.ptszName = m_tszUserName; mi.position = 500090000; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = iconList[0].hIcolib; hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi); } diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 37e3d70cc0..c8a167d0d6 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -35,7 +35,7 @@ void CIrcProto::InitMainMenus(void) mi.ptszName = m_tszUserName; mi.position = -1999901010; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = GetIconHandle(IDI_MAIN); hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi); } @@ -45,7 +45,7 @@ void CIrcProto::InitMainMenus(void) hMenuRoot = NULL; } - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.pszName = LPGEN("&Quick connect"); mi.icolibItem = GetIconHandle(IDI_QUICK); mir_strcpy(d, IRC_QUICKCONNECT); 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; diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 740ab95550..fa103f86b7 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -339,7 +339,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI if (hRootMenu == NULL) { mi.ptszName = m_tszUserName; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.hIcon = g_hMainIcon; hRootMenu = Menu_AddProtoMenuItem(&mi); } @@ -351,14 +351,14 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI else { fnAddFunc = Menu_AddContactMenuItem; mi.position = lPosition; - mi.flags = CMIF_ROOTPOPUP; + mi.flags = CMIF_ROOTHANDLE; } mi.pszName = LPGEN("Services..."); mi.hIcon = g_hMainIcon; hRootMenu = fnAddFunc(&mi); - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = hRootMenu; mi.popupPosition = lPopupPosition; mi.pszService = szServiceFunction; diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 67f742da1c..52c56bebb0 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -278,7 +278,7 @@ void CMsnProto::MsnInitMainMenu(void) if (hRoot == NULL) { mi.popupPosition = 500085000; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = GetIconHandle(IDI_MSN); mi.ptszName = m_tszUserName; hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi); @@ -288,7 +288,7 @@ void CMsnProto::MsnInitMainMenu(void) mainMenuRoot = NULL; } - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = hRoot; mi.pszService = servicefunction; diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index 82b805699e..2f620ff0ff 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -121,7 +121,7 @@ int CSkypeProto::OnInitStatusMenu() 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 = Skin_GetIconHandle("main"); hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi); } @@ -133,7 +133,7 @@ int CSkypeProto::OnInitStatusMenu() m_hMenuRoot = NULL; }*/ mi.hParentMenu = hStatusMunuRoot; - mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; mir_strcpy(tDest, "/CreateNewChat"); diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index eeaec5377a..d997b29fc2 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -109,7 +109,7 @@ void CSteamProto::OnInitStatusMenu() 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 = NULL; hSteamRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi); } @@ -121,7 +121,7 @@ void CSteamProto::OnInitStatusMenu() } mi.hParentMenu = hSteamRoot; - mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; // Show block list mir_strcpy(tDest, "/BlockList"); diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index 744a33c2f5..a6a38e0298 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -273,11 +273,11 @@ void TlenProtocol::initMenuItems() mi.ptszName = m_tszUserName; mi.position = -1999901009; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; mi.icolibItem = GetIconHandle(IDI_TLEN); hMenuRoot = Menu_AddMainMenuItem(&mi); - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = (HGENMENU)hMenuRoot; hMenuChats = NULL; diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index 6753214e3b..7657f80bea 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -89,7 +89,7 @@ int CToxProto::OnInitStatusMenu() 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 = Skin_GetIconHandle("main"); hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi); } @@ -101,7 +101,7 @@ int CToxProto::OnInitStatusMenu() }*/ mi.hParentMenu = hStatusMunuRoot; - mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR; // Create copy tox id command mir_strcpy(tDest, "/CopyToxID"); diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 8652c96d2c..23ab2d7fd4 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -195,7 +195,7 @@ void CVkProto::InitMenus() char szService[100]; // Proto menu - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName); mir_snprintf(szService, "%s%s", m_szModuleName, PS_CREATECHAT); @@ -305,7 +305,7 @@ void CVkProto::InitMenus() mi.pszService = szService; g_hContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi); - mi.flags |= CMIF_CHILDPOPUP; + mi.flags |= CMIF_ROOTHANDLE; mi.hParentMenu = g_hContactMenuItems[CMI_GETSERVERHISTORY]; mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST1DAY); diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index 6851cc571f..5210749b76 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -58,7 +58,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) if (hRoot == NULL) { mi.popupPosition = 500085000; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED); + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED); mi.icolibItem = GetIconHandle("whatsApp"); mi.ptszName = m_tszUserName; hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi); @@ -69,7 +69,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) m_hMenuRoot = NULL; } - mi.flags = CMIF_CHILDPOPUP | (isOnline() ? 0 : CMIF_GRAYED); + mi.flags = CMIF_ROOTHANDLE | (isOnline() ? 0 : CMIF_GRAYED); mi.position = 201001; CreateProtoService("/CreateGroup", &WhatsAppProto::OnCreateGroup); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index d935f50d16..658824f400 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -376,7 +376,7 @@ void CYahooProto::MenuMainInit(void) if (hRoot == NULL) { mi.position = 500015000; mi.hParentMenu = HGENMENU_ROOT; - mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; + mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED; mi.icolibItem = GetIconHandle(IDI_YAHOO); mi.ptszName = m_tszUserName; hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi); @@ -387,7 +387,7 @@ void CYahooProto::MenuMainInit(void) mainMenuRoot = NULL; } - mi.flags = CMIF_CHILDPOPUP; + mi.flags = CMIF_ROOTHANDLE; mi.hParentMenu = hRoot; // Show custom status menu -- cgit v1.2.3