myGlobals.UseDbxTree : always false

5 files changed, 3 insertions, 8 deletions

diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index 7c82290b63..81187c6502 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
@@ -573,8 +573,7 @@ int MAnnivDate::DBWriteBirthDate(MCONTACT hContact)
 				// only delete values from current contact's custom modules

 				!(_wFlags & (MADF_HASPROTO|MADF_HASMETA)) &&

 				// check whether user wants this feature

-				db_get_b(NULL, MODNAME, SET_REMIND_SECUREBIRTHDAY, TRUE) &&

-				!myGlobals.UseDbxTree)

+				db_get_b(NULL, MODNAME, SET_REMIND_SECUREBIRTHDAY, TRUE))

 		{

 			// keep the database clean

 

diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 39cb71211a..4fa242d8ed 100644
--- a/plugins/UserInfoEx/src/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -175,9 +175,6 @@ extern "C" int __declspec(dllexport) Load(void)
 			dwmIsCompositionEnabled = (pfnDwmIsCompositionEnabled)GetProcAddress(hDwmApi, "DwmIsCompositionEnabled");

 	}

 

-	// check for dbx_tree

-	myGlobals.UseDbxTree = ServiceExists("DBT/Entity/GetRoot");

-

 	// load icon library

 	IcoLib_LoadModule();

 

diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index a27b0c6190..64f0140126 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -581,7 +581,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam
 	switch (uMsg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hDlg);

-		ShowWindow(GetDlgItem(hDlg, CHECK_REMIND_SECURED), myGlobals.UseDbxTree ? SW_HIDE : SW_SHOW);

+		ShowWindow(GetDlgItem(hDlg, CHECK_REMIND_SECURED), SW_SHOW);

 

 		SendDlgItemMessage(hDlg, ICO_BIRTHDAY, STM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_DLG_ANNIVERSARY, TRUE));

 

diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h
index ae64b4d4b6..5a310a6148 100644
--- a/plugins/UserInfoEx/src/stdafx.h
+++ b/plugins/UserInfoEx/src/stdafx.h
@@ -166,7 +166,6 @@ typedef struct _MGLOBAL
 	BYTE		PopupActionsExist : 1;			// Popup++ or MS_POPUP_REGISTERACTIONS exist

 	BYTE		ShowPropsheetColours : 1;		// cached SET_PROPSHEET_SHOWCOLOURS database value

 	BYTE		WantAeroAdaption : 1;			// reserved for later use

-	BYTE		UseDbxTree : 1;					// use dbx_tree ?

 } MGLOBAL, *LPMGLOBAL;

 

 extern HINSTANCE		ghInst;

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index b76227f7de..a291ec092a 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -843,7 +843,7 @@ void SvcReminderEnable(BYTE bEnable)
 		if (!ghCListIA)

 			ghCListIA = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, (MIRANDAHOOK)OnCListApplyIcon);

 

-		if (!ghSettingsChanged && !myGlobals.UseDbxTree)

+		if (!ghSettingsChanged)

 			ghSettingsChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, (MIRANDAHOOK)OnContactSettingChanged);

 

 		// reinit reminder options