various menu items quirks, simplifications & optimization

git-svn-id: http://svn.miranda-ng.org/main/trunk@4319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

16 files changed, 66 insertions, 72 deletions

diff --git a/plugins/TabSRMM/src/chat/clist.cpp b/plugins/TabSRMM/src/chat/clist.cpp
index 5506aa5cad..18172a2e01 100644
--- a/plugins/TabSRMM/src/chat/clist.cpp
+++ b/plugins/TabSRMM/src/chat/clist.cpp
@@ -194,7 +194,7 @@ INT_PTR CList_JoinChat(WPARAM wParam, LPARAM lParam)
 	if ( hContact ) {

 		char* szProto = GetContactProto(hContact);

 		if ( szProto ) {

-			if ( DBGetContactSettingWord( hContact, szProto, "Status", 0 ) == ID_STATUS_OFFLINE )

+			if ( db_get_w( hContact, szProto, "Status", 0 ) == ID_STATUS_OFFLINE )

 				CallProtoService( szProto, PS_JOINCHAT, wParam, lParam );

 			else

 				CList_RoomDoubleclicked( wParam, 0 );

@@ -217,31 +217,28 @@ INT_PTR CList_LeaveChat(WPARAM wParam, LPARAM lParam)
 int CList_PrebuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

 	HANDLE hContact = (HANDLE)wParam;

-	if ( hContact ) {

-		char* szProto = GetContactProto(hContact);

+	if (hContact == NULL)

+		return 0;

 

-		CLISTMENUITEM clmi = { sizeof(clmi) };

-		clmi.flags = CMIM_FLAGS | CMIF_DEFAULT | CMIF_HIDDEN;

+	bool bEnabled = false;

+	char *szProto = GetContactProto(hContact);

+	if ( szProto ) {

+		// display this menu item only for chats

+		if ( M->GetByte(hContact, szProto, "ChatRoom", 0 )) {

+			// still hide it for offline protos

+			if (CallProtoService( szProto, PS_GETSTATUS, 0, 0 ) != ID_STATUS_OFFLINE) {

+				CLISTMENUITEM clmi = { sizeof(clmi) };

+				clmi.flags = CMIM_NAME;

+				if (db_get_w( hContact, szProto, "Status", 0 ) == ID_STATUS_OFFLINE)

+					clmi.pszName = (char*)LPGEN("Join chat");

+				else

+					clmi.pszName = (char*)LPGEN("Open chat window");

+				Menu_ModifyItem(hJoinMenuItem, &clmi);

+				bEnabled = true;

+	}	}	}

 

-		if ( szProto ) {

-			// display this menu item only for chats

-			if ( M->GetByte(hContact, szProto, "ChatRoom", 0 )) {

-				// still hide it for offline protos

-				if ( CallProtoService( szProto, PS_GETSTATUS, 0, 0 ) != ID_STATUS_OFFLINE ) {

-					clmi.flags &= ~CMIF_HIDDEN;

-					clmi.flags |= CMIM_NAME;

-

-					if ( DBGetContactSettingWord( hContact, szProto, "Status", 0 ) == ID_STATUS_OFFLINE )

-						clmi.pszName = ( char* )LPGEN("Join chat");

-					else

-						clmi.pszName = ( char* )LPGEN("Open chat window");

-		}	}	}

-		CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )hJoinMenuItem, ( LPARAM )&clmi );

-

-		clmi.flags &= ~(CMIM_NAME | CMIF_DEFAULT);

-		clmi.flags |= CMIF_NOTOFFLINE;

-		CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )hLeaveMenuItem, ( LPARAM )&clmi );

-	}

+	Menu_ShowItem(hJoinMenuItem, bEnabled);

+	Menu_ShowItem(hLeaveMenuItem, bEnabled);

 	return 0;

 }

 

@@ -250,7 +247,6 @@ INT_PTR CList_PrebuildContactMenuSvc(WPARAM wParam, LPARAM lParam)
 	return CList_PrebuildContactMenu(wParam, lParam);

 }

 

-

 void CList_CreateGroup(TCHAR* group)

 {

 	if (!group)

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index c3a1ada839..bcd2cc9452 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -40,7 +40,8 @@ CRITICAL_SECTION  cs;
 

 HANDLE hSendEvent;

 HANDLE hBuildMenuEvent;

-HANDLE hJoinMenuItem, hLeaveMenuItem;

+

+HGENMENU hJoinMenuItem, hLeaveMenuItem;

 

 static HANDLE

 	hServiceRegister = NULL,

@@ -458,8 +459,8 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 	else lstrcpyn(newcontactname, _T("_U_"), SIZEOF(newcontactname));

 

 	char *szProto = GetContactProto(newData.hContact);

-	WORD wStatus = szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord((HANDLE) newData.hContact, szProto, "Status", ID_STATUS_OFFLINE);

-	char *szStatus = (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord((HANDLE)newData.hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+	WORD wStatus = szProto == NULL ? ID_STATUS_OFFLINE : db_get_w((HANDLE) newData.hContact, szProto, "Status", ID_STATUS_OFFLINE);

+	char *szStatus = (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w((HANDLE)newData.hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 

 	newData.item.pszText = newcontactname;

 	newData.item.mask = TCIF_TEXT | TCIF_IMAGE | TCIF_PARAM;

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index a18b760cc8..d424e03f78 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -287,7 +287,7 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg)
 	dat->hTabIcon = dat->hTabStatusIcon;

 

 	if (dat->iTabID >= 0) {

-		if (DBGetContactSettingWord(si->hContact, si->pszModule , "ApparentMode", 0) != 0)

+		if (db_get_w(si->hContact, si->pszModule , "ApparentMode", 0) != 0)

 			DBWriteContactSettingWord(si->hContact, si->pszModule , "ApparentMode", (LPARAM)0);

 		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

 			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index be9094e797..8b2bdf2609 100644
--- a/plugins/TabSRMM/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
@@ -265,7 +265,7 @@ extern const TCHAR *pszIDCSAVE_save, *pszIDCSAVE_close;
 extern char *TemplateNames[];

 extern HANDLE hUserPrefsWindowList;

 extern struct TCpTable cpTable[];

-extern HANDLE hJoinMenuItem, hLeaveMenuItem;

+extern HGENMENU hJoinMenuItem, hLeaveMenuItem;

 extern FONTINFO	aFonts[OPTIONS_FONTCOUNT];

 extern TCHAR *pszActiveWndID;

 extern char *pszActiveWndModule;

diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index 28ae75bb1d..74238bb783 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -148,14 +148,12 @@ bool CContactCache::updateNick()
  */

 bool CContactCache::updateStatus()

 {

-	if (m_Valid) {

-		m_wOldStatus = m_wStatus;

-		m_wStatus = (WORD)DBGetContactSettingWord(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE);

+	if (!m_Valid)

+		return false;

 

-		return(m_wOldStatus != m_wStatus);

-	}

-	else

-		return(false);

+	m_wOldStatus = m_wStatus;

+	m_wStatus = (WORD)db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE);

+	return m_wOldStatus != m_wStatus;

 }

 

 /**

@@ -174,7 +172,7 @@ void CContactCache::updateMeta(bool fForce)
 				PROTOACCOUNT *acc = reinterpret_cast<PROTOACCOUNT *>(::CallService(MS_PROTO_GETACCOUNT, 0, (LPARAM)m_szMetaProto));

 				if (acc && acc->tszAccountName)

 					m_szAccount = acc->tszAccountName;

-				m_wMetaStatus = DBGetContactSettingWord(m_hSubContact, m_szMetaProto, "Status", ID_STATUS_OFFLINE);

+				m_wMetaStatus = db_get_w(m_hSubContact, m_szMetaProto, "Status", ID_STATUS_OFFLINE);

 				MultiByteToWideChar(CP_ACP, 0, m_szMetaProto, -1, m_tszMetaProto, 40);

 				m_tszMetaProto[39] = 0;

 			}

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index d28e8c7625..5e96b41fa4 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -2546,7 +2546,7 @@ HMENU TSAPI BuildMCProtocolMenu(HWND hwndDlg)
 			if ((handle = (HANDLE)M->GetDword(dat->hContact, PluginConfig.szMetaName, szTemp, 0)) != 0) {

 				nick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)handle, GCDNF_TCHAR);

 				mir_snprintf(szTemp, sizeof(szTemp), "Status%d", i);

-				wStatus = (WORD)DBGetContactSettingWord(dat->hContact, PluginConfig.szMetaName, szTemp, 0);

+				wStatus = (WORD)db_get_w(dat->hContact, PluginConfig.szMetaName, szTemp, 0);

 				szStatusText = (TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, wStatus, GSMDF_TCHAR);

 			}

 			mir_sntprintf(szMenuLine, SIZEOF(szMenuLine), _T("%s: %s [%s] %s"), acc->tszAccountName, nick, szStatusText,

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index dddc88f579..ee0bd16407 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -805,7 +805,7 @@ int TSAPI UpdateTrayMenu(const TWindowData *dat, WORD wStatus, const char *szPro
 		if (tszFinalProto == 0)

 			return 0;									// should also NOT happen

 

-		wMyStatus = (wStatus == 0) ? DBGetContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE) : wStatus;

+		wMyStatus = (wStatus == 0) ? db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE) : wStatus;

 		szMyStatus = (szStatus == NULL) ? (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)wMyStatus, GSMDF_TCHAR) : szStatus;

 		mii.wID = (UINT)hContact;

 		mii.hbmpItem = HBMMENU_CALLBACK;

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index dc1ec8c84e..5cad2d5e0b 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1033,7 +1033,7 @@ void TSAPI DM_SetDBButtonStates(HWND hwndChild, struct TWindowData *dat)
 					break;

 				}

 				case DBVT_WORD: {

-					WORD val = DBGetContactSettingWord(hFinalContact, szModule, szSetting, 0);

+					WORD val = db_get_w(hFinalContact, szModule, szSetting, 0);

 					result = (val == *((WORD *) & buttonItem->bValuePush));

 					break;

 				}

@@ -1440,10 +1440,10 @@ void TSAPI DM_NotifyTyping(struct TWindowData *dat, int mode)
 		 * check visibility/invisibility lists to not "accidentially" send MTN to contacts who

 		 * should not see them (privacy issue)

 		 */

-		if (protoCaps & PF1_VISLIST && DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)

+		if (protoCaps & PF1_VISLIST && db_get_w(hContact, szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)

 			return;

 

-		if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)

+		if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && db_get_w(hContact, szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)

 			return;

 

 		/*

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index e0fdecf406..38581de550 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -230,7 +230,7 @@ void CGlobals::reloadSettings(bool fReloadSkins)
 	m_SendOnDblEnter = 					(int)M->GetByte("SendOnDblEnter", 0);

 	m_AutoLocaleSupport = 				(int)M->GetByte("al", 0);

 	m_AutoSwitchTabs = 					(int)M->GetByte("autoswitchtabs", 1);

-	m_CutContactNameTo = 				(int) DBGetContactSettingWord(NULL, SRMSGMOD_T, "cut_at", 15);

+	m_CutContactNameTo = 				(int)db_get_w(NULL, SRMSGMOD_T, "cut_at", 15);

 	m_CutContactNameOnTabs = 			(int)M->GetByte("cuttitle", 0);

 	m_StatusOnTabs = 					(int)M->GetByte("tabstatus", 1);

 	m_LogStatusChanges = 				(int)M->GetByte("logstatuschanges", 0);

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 4e13942b16..344c9ef134 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -192,7 +192,7 @@ public:
    BYTE        m_dontUseDefaultKbd;

    HANDLE      hSvc[SERVICE_LAST];

    HANDLE      m_event_MsgWin, m_event_MsgPopup;

-   HANDLE      m_hMenuItem;

+   HGENMENU    m_hMenuItem;

    BYTE        m_useAeroPeek;

 

    WINDOWPLACEMENT    m_GlobalContainerWpos;

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 4deb632c9f..cc067fd278 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -647,20 +647,19 @@ int CMimAPI::ProtoAck(WPARAM wParam, LPARAM lParam)
 int CMimAPI::PrebuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

 	HANDLE hContact = (HANDLE)wParam;

-	if ( hContact ) {

-		CLISTMENUITEM clmi = { sizeof(clmi) };

-		clmi.flags = CMIM_FLAGS | CMIF_DEFAULT | CMIF_HIDDEN;

-

-		char *szProto = GetContactProto(hContact);

-		if ( szProto ) {

-			// leave this menu item hidden for chats

-			if ( !M->GetByte(hContact, szProto, "ChatRoom", 0 ))

-				if ( CallProtoService( szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND )

-					clmi.flags &= ~CMIF_HIDDEN;

-		}

-

-		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)PluginConfig.m_hMenuItem, (LPARAM)&clmi);

+	if (hContact == NULL)

+		return NULL;

+

+	bool bEnabled = false;

+	char *szProto = GetContactProto(hContact);

+	if (szProto) {

+		// leave this menu item hidden for chats

+		if ( !M->GetByte(hContact, szProto, "ChatRoom", 0 ))

+			if ( CallProtoService( szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND )

+				bEnabled = true;

 	}

+

+	Menu_ShowItem(PluginConfig.m_hMenuItem, bEnabled);

 	return 0;

 }

 

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 5778442b2b..10c5b6fbbb 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1319,7 +1319,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			dat->cache->updateUIN();

 

 			if (dat->hContact && dat->szProto != NULL) {

-				dat->wStatus = DBGetContactSettingWord(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);

+				dat->wStatus = db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);

 				mir_sntprintf(dat->szStatus, SIZEOF(dat->szStatus), _T("%s"), (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, dat->szProto == NULL ? ID_STATUS_OFFLINE : dat->wStatus, GSMDF_TCHAR));

 			} else

 				dat->wStatus = ID_STATUS_OFFLINE;

@@ -3362,7 +3362,7 @@ quote_from_last:
 			if ((isForced = M->GetDword(dat->hContact, "tabSRMM_forced", -1)) >= 0) {

 				char szTemp[64];

 				mir_snprintf(szTemp, sizeof(szTemp), "Status%d", isForced);

-				if (DBGetContactSettingWord(dat->hContact, PluginConfig.szMetaName, szTemp, 0) == ID_STATUS_OFFLINE) {

+				if (db_get_w(dat->hContact, PluginConfig.szMetaName, szTemp, 0) == ID_STATUS_OFFLINE) {

 					TCHAR szBuffer[200];

 					mir_sntprintf(szBuffer, 200, TranslateT("Warning: you have selected a subprotocol for sending the following messages which is currently offline"));

 					SendMessage(hwndDlg, DM_ACTIVATETOOLTIP, IDC_MESSAGE, (LPARAM)szBuffer);

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 47ed9fc84d..c6ba4665cf 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1399,7 +1399,7 @@ void TSAPI FindFirstEvent(TWindowData *dat)
 			if (dat->bActualHistory)

 				i = dat->cache->getSessionMsgCount();

 			else

-				i = DBGetContactSettingWord(NULL, SRMSGMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT);

+				i = db_get_w(NULL, SRMSGMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT);

 			//

 			for (; i > 0; i--) {

 				if (dat->hDbEventFirst == NULL)

@@ -1426,7 +1426,7 @@ void TSAPI FindFirstEvent(TWindowData *dat)
 			dbei.timestamp = time(NULL);

 		else

 			db_event_get(dat->hDbEventFirst, &dbei);

-		firstTime = dbei.timestamp - 60 * DBGetContactSettingWord(NULL, SRMSGMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME);

+		firstTime = dbei.timestamp - 60 * db_get_w(NULL, SRMSGMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME);

 		for (;;) {

 			if (dat->hDbEventFirst == NULL)

 				hPrevEvent = db_event_last(dat->hContact);

@@ -2407,10 +2407,10 @@ void TSAPI SendHBitmapAsFile(const TWindowData* dat, HBITMAP hbmp)
 	if ((ID_STATUS_OFFLINE == wMyStatus) || (ID_STATUS_OFFLINE == dat->cache->getActiveStatus() && !(typeCaps & PF4_OFFLINEFILES)))

 		fSend = false;

 

-	if (protoCaps & PF1_VISLIST && DBGetContactSettingWord(dat->cache->getActiveContact(), szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)

+	if (protoCaps & PF1_VISLIST && db_get_w(dat->cache->getActiveContact(), szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)

 		fSend = false;

 

-	if (protoCaps & PF1_INVISLIST && wMyStatus == ID_STATUS_INVISIBLE && DBGetContactSettingWord(dat->cache->getActiveContact(), szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)

+	if (protoCaps & PF1_INVISLIST && wMyStatus == ID_STATUS_INVISIBLE && db_get_w(dat->cache->getActiveContact(), szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)

 		fSend = false;

 

 	if (!fSend) {

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index 0b3db15ff0..9fae10db4e 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -558,7 +558,7 @@ int TSAPI DbEventIsShown(struct TWindowData *dat, DBEVENTINFO * dbei)
 

 static int DbEventIsForMsgWindow(DBEVENTINFO *dbei)

 {

-	DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )CallService( MS_DB_EVENT_GETTYPE, ( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );

+	DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);

 	return et && ( et->flags & DETF_MSGWINDOW );

 }

 

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 3de3ae9d61..4392e11dc6 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -623,9 +623,9 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 			}

 

 			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));

-			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, DBGetContactSettingWord(NULL, SRMSGMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));

+			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMSGMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));

 			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETRANGE, 0, MAKELONG(24 * 60, 0));

-			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETPOS, 0, DBGetContactSettingWord(NULL, SRMSGMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));

+			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMSGMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));

 

 			SetDlgItemInt(hwndDlg, IDC_INDENTAMOUNT, M->GetDword("IndentAmount", 20), FALSE);

 			SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_SETRANGE, 0, MAKELONG(1000, 0));

@@ -1049,7 +1049,7 @@ static INT_PTR CALLBACK DlgProcTabbedOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 

 			CheckDlgButton(hwndDlg, IDC_CUT_TABTITLE, M->GetByte("cuttitle", 0));

 			SendDlgItemMessage(hwndDlg, IDC_CUT_TITLEMAXSPIN, UDM_SETRANGE, 0, MAKELONG(20, 5));

-			SendDlgItemMessage(hwndDlg, IDC_CUT_TITLEMAXSPIN, UDM_SETPOS, 0, (WPARAM)DBGetContactSettingWord(NULL, SRMSGMOD_T, "cut_at", 15));

+			SendDlgItemMessage(hwndDlg, IDC_CUT_TITLEMAXSPIN, UDM_SETPOS, 0, (WPARAM)db_get_w(NULL, SRMSGMOD_T, "cut_at", 15));

 

 			Utils::enableDlgControl(hwndDlg, IDC_CUT_TITLEMAX, IsDlgButtonChecked(hwndDlg, IDC_CUT_TABTITLE));

 			Utils::enableDlgControl(hwndDlg, IDC_CUT_TITLEMAXSPIN, IsDlgButtonChecked(hwndDlg, IDC_CUT_TABTITLE));

@@ -1399,7 +1399,7 @@ DWORD OptCheckBox_LoadValue(struct OptCheckBox *cb)
 		case DBVT_BYTE:

 			return M->GetByte(cb->dbModule, cb->dbSetting, cb->defValue);

 		case DBVT_WORD:

-			return DBGetContactSettingWord(NULL, cb->dbModule, cb->dbSetting, cb->defValue);

+			return db_get_w(NULL, cb->dbModule, cb->dbSetting, cb->defValue);

 		case DBVT_DWORD:

 			return M->GetDword(cb->dbModule, cb->dbSetting, cb->defValue);

 		}

@@ -1521,9 +1521,9 @@ static INT_PTR CALLBACK DlgProcTabSrmmModernOptions(HWND hwndDlg, UINT msg, WPAR
 			}

 

 			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));

-			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, DBGetContactSettingWord(NULL, SRMSGMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));

+			SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMSGMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));

 			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETRANGE, 0, MAKELONG(24 * 60, 0));

-			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETPOS, 0, DBGetContactSettingWord(NULL, SRMSGMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));

+			SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMSGMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));

 

 			SendDlgItemMessage(hwndDlg, IDC_TRIMSPIN, UDM_SETRANGE, 0, MAKELONG(1000, 5));

 			SendDlgItemMessage(hwndDlg, IDC_TRIMSPIN, UDM_SETPOS, 0, maxhist);

diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 1684601ae2..212ba2d8b4 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -249,7 +249,7 @@ void TSAPI AddContactToFavorites(HANDLE hContact, const TCHAR *szNickname, const
 		szProto = GetContactProto(hContact);

 	if (szProto) {

 		if (wStatus == 0)

-			wStatus = DBGetContactSettingWord((HANDLE)hContact, szProto, "Status", ID_STATUS_OFFLINE);

+			wStatus = db_get_w((HANDLE)hContact, szProto, "Status", ID_STATUS_OFFLINE);

 		if (szStatus == NULL)

 			szStatus = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, wStatus, GSMDF_TCHAR);

 	}