From 6be9b9c1dd00da5ecd33cbc20ece4162ba56c402 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 Jul 2014 14:11:25 +0000 Subject: db_mc_tryMeta applied git-svn-id: http://svn.miranda-ng.org/main/trunk@9860 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdfile/filerecvdlg.cpp | 3 +-- src/core/stdmsg/src/msgs.cpp | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index f238a91199..5bed7dbd7b 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.cpp @@ -139,8 +139,7 @@ void GetContactReceivedFilesDir(MCONTACT hContact, TCHAR *szDir, int cchDir, BOO mir_sntprintf(tszTemp, SIZEOF(tszTemp), _T("%%mydocuments%%\\%s\\%%userid%%"), TranslateT("My received files")); if (hContact) { - if (db_mc_isSub(hContact)) - hContact = db_mc_getMeta(hContact); + hContact = db_mc_tryMeta(hContact); REPLACEVARSDATA dat = { 0 }; REPLACEVARSARRAY rvaVarsToReplace[4]; diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 50ac6ae753..66c8f739cb 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -108,8 +108,7 @@ INT_PTR SendMessageCmd(MCONTACT hContact, char* msg, int isWchar) if (!szProto || (!CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND)) return 1; - if (db_mc_isSub(hContact)) - hContact = db_mc_getMeta(hContact); + hContact = db_mc_tryMeta(hContact); HWND hwnd; if (hwnd = WindowList_Find(g_dat.hMessageWindowList, hContact)) { @@ -160,8 +159,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) if (!(g_dat.flags & SMF_SHOWTYPING)) return 0; - if (db_mc_isSub(hContact)) - hContact = db_mc_getMeta(hContact); + hContact = db_mc_tryMeta(hContact); SkinPlaySound((lParam) ? "TNStart" : "TNStop"); -- cgit v1.2.3