diff options
| author | George Hazan <ghazan@miranda.im> | 2019-09-27 21:32:12 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-09-27 21:32:12 +0300 |
| commit | 426e2f9755a14023223e2e3ebfa8e78f6e8677a8 (patch) | |
| tree | ae387e1079fe63cea4d928a0e2564f218836d548 /plugins/MirandaG15/src | |
| parent | ea45fcc6216051c084a762a8fd2d170e095bb1ba (diff) | |
fix for a function name:
Clist_IsHidden => Contact_IsHidden
Clist_HideContact => Contact_Hide
Diffstat (limited to 'plugins/MirandaG15/src')
| -rw-r--r-- | plugins/MirandaG15/src/CAppletManager.cpp | 4 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/CContactList.cpp | 4 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/CEventScreen.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/StdAfx.h | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index 1942853761..e30975cc82 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -1123,7 +1123,7 @@ int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam) Event.hContact = NULL; // Ignore events from hidden chatrooms, except for join events - if (gce->pszID.w != nullptr && Clist_IsHidden(Event.hContact)) { + if (gce->pszID.w != nullptr && Contact_IsHidden(Event.hContact)) { if (gce->iType == GC_EVENT_JOIN && pHistory) pHistory->LUsers.push_back(toTstring(gce->pszNick.w)); @@ -1645,7 +1645,7 @@ int CAppletManager::HookSettingChanged(WPARAM hContact, LPARAM lParam) else if (!strcmp(dbcws->szModule, "CList")) { if (!strcmp(dbcws->szSetting, "Hidden")) { Event.eType = EVENT_CONTACT_HIDDEN; - Event.iValue = Clist_IsHidden(hContact); + Event.iValue = Contact_IsHidden(hContact); } else if (!strcmp(dbcws->szSetting, "Group")) { Event.eType = EVENT_CONTACT_GROUP; diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index 1331ef94e9..e50c5d57f8 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -202,12 +202,12 @@ bool CContactList::IsVisible(CContactListEntry *pEntry) return true;
if (CConfig::GetBoolSetting(CLIST_USEIGNORE)) {
- if (Clist_IsHidden(pEntry->hHandle))
+ if (Contact_IsHidden(pEntry->hHandle))
return false;
if (db_mc_isSub(pEntry->hHandle)) {
MCONTACT hMetaContact = db_mc_getMeta(pEntry->hHandle);
- if (Clist_IsHidden(hMetaContact))
+ if (Contact_IsHidden(hMetaContact))
return false;
}
}
diff --git a/plugins/MirandaG15/src/CEventScreen.cpp b/plugins/MirandaG15/src/CEventScreen.cpp index c307a5715b..324f508369 100644 --- a/plugins/MirandaG15/src/CEventScreen.cpp +++ b/plugins/MirandaG15/src/CEventScreen.cpp @@ -186,7 +186,7 @@ void CEventScreen::OnLCDButtonDown(int iButton) char *szProto = GetContactProto(pEntry->hContact);
CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(toTstring(szProto));
- if (pIRCCon && db_get_b(pEntry->hContact, szProto, "ChatRoom", 0) != 0 && Clist_IsHidden(pEntry->hContact))
+ if (pIRCCon && db_get_b(pEntry->hContact, szProto, "ChatRoom", 0) != 0 && Contact_IsHidden(pEntry->hContact))
return;
CAppletManager::GetInstance()->ActivateChatScreen(pEntry->hContact);
diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h index 29978e1e66..61fed0dbd1 100644 --- a/plugins/MirandaG15/src/StdAfx.h +++ b/plugins/MirandaG15/src/StdAfx.h @@ -17,6 +17,7 @@ using namespace std;
#include <newpluginapi.h>
+#include <m_contacts.h>
#include <m_message.h>
#include <m_protosvc.h>
#include <m_database.h>
|