diff options
Diffstat (limited to 'plugins/HistoryStats')
| -rw-r--r-- | plugins/HistoryStats/src/dlgoption_subinput.cpp | 12 | ||||
| -rw-r--r-- | plugins/HistoryStats/src/mirandahistory.cpp | 6 | ||||
| -rw-r--r-- | plugins/HistoryStats/src/mu_common.cpp | 22 | ||||
| -rw-r--r-- | plugins/HistoryStats/src/mu_common.h | 11 |
4 files changed, 8 insertions, 43 deletions
diff --git a/plugins/HistoryStats/src/dlgoption_subinput.cpp b/plugins/HistoryStats/src/dlgoption_subinput.cpp index 5f808f6b09..351132100a 100644 --- a/plugins/HistoryStats/src/dlgoption_subinput.cpp +++ b/plugins/HistoryStats/src/dlgoption_subinput.cpp @@ -78,13 +78,11 @@ void DlgOption::SubInput::onWMInitDialog() hTemp = m_Options.insertGroup(NULL, TranslateT("Contact filtering"), OptionsCtrl::OCF_ROOTGROUP | OptionsCtrl::OCF_NODISABLECHILDS);
m_hProtocols = m_Options.insertGroup(hTemp, TranslateT("Ignore all contacts with protocol..."));
- if (mu::metacontacts::_available()) {
- hTemp2 = m_Options.insertGroup(hTemp, TranslateT("History read mode for MetaContacts"), mu::metacontacts::_available() ? 0 : OptionsCtrl::OCF_DISABLED);
- m_hMetaContactsMode = m_Options.insertRadio(hTemp2, NULL, TranslateT("Use only meta-contact's history"));
- m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use only subcontacts' histories (for one meta-contact)"));
- m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use meta-contact's history and its subcontacts' histories"));
- m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Treat meta-contacts and subcontacts as normal contacts"));
- }
+ hTemp2 = m_Options.insertGroup(hTemp, TranslateT("History read mode for MetaContacts"), 0);
+ m_hMetaContactsMode = m_Options.insertRadio(hTemp2, NULL, TranslateT("Use only meta-contact's history"));
+ m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use only subcontacts' histories (for one meta-contact)"));
+ m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use meta-contact's history and its subcontacts' histories"));
+ m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Treat meta-contacts and subcontacts as normal contacts"));
m_hMergeContacts = m_Options.insertCheck(hTemp, TranslateT("Merge contacts with same name"), OptionsCtrl::OCF_DISABLECHILDSONUNCHECK);
m_hMergeContactsGroups = m_Options.insertCheck(m_hMergeContacts, TranslateT("Only merge if contacts are in the same group"));
diff --git a/plugins/HistoryStats/src/mirandahistory.cpp b/plugins/HistoryStats/src/mirandahistory.cpp index 867b8756f2..60c4df0ba0 100644 --- a/plugins/HistoryStats/src/mirandahistory.cpp +++ b/plugins/HistoryStats/src/mirandahistory.cpp @@ -59,7 +59,7 @@ void MirandaHistory::makeContactsAvailable() void MirandaHistory::readContacts()
{
- bool bHandleMeta = mu::metacontacts::_available() && m_Settings.m_MetaContactsMode != Settings::mcmIgnoreMeta;
+ bool bHandleMeta = m_Settings.m_MetaContactsMode != Settings::mcmIgnoreMeta;
ext::a::string strMetaProto = bHandleMeta ? META_PROTO : "";
MirandaSettings db;
@@ -106,10 +106,10 @@ void MirandaHistory::readContacts() // include meta-contact's subcontact
if (m_Settings.m_MetaContactsMode != Settings::mcmMetaOnly) {
// find subcontacts to read history from
- int numSubs = mu::metacontacts::getNumContacts(hContact);
+ int numSubs = db_mc_getSubCount(hContact);
if (numSubs > 0) {
for (int i = 0; i < numSubs; ++i) {
- MCONTACT hSubContact = mu::metacontacts::getSubContact(hContact, i);
+ MCONTACT hSubContact = db_mc_getSub(hContact, i);
if (hSubContact)
sources.push_back(hSubContact);
}
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 1a3d5c199e..0f0bfa7b52 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -187,28 +187,6 @@ namespace mu }
/*
- * metacontacts [external]
- */
-
- namespace metacontacts
- {
- bool _available()
- {
- return true;
- }
-
- int getNumContacts(MCONTACT hMetaContact)
- {
- return CallService(MS_MC_GETNUMCONTACTS, hMetaContact, 0);
- }
-
- MCONTACT getSubContact(MCONTACT hMetaContact, int iContactNumber)
- {
- return CallService(MS_MC_GETSUBCONTACT, hMetaContact, iContactNumber);
- }
- }
-
- /*
* opt
*/
diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h index c599d15f61..8ad005a5f4 100644 --- a/plugins/HistoryStats/src/mu_common.h +++ b/plugins/HistoryStats/src/mu_common.h @@ -63,17 +63,6 @@ namespace mu }
/*
- * metacontacts [external]
- */
-
- namespace metacontacts
- {
- bool _available();
- int getNumContacts(MCONTACT hMetaContact);
- MCONTACT getSubContact(MCONTACT hMetaContact, int iContactNumber);
- }
-
- /*
* opt
*/
|