jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #26839: daemon: remove dead code

Browse Source
This commit is contained in:
Tristan Matthews
2013-07-15 13:49:15 -04:00
parent 40adb03fe2
commit f5fd767ce7
5 changed files with 2 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
daemon/src/client/android/configurationmanager.cpp
View File

@ -380,38 +380,6 @@ std::string ConfigurationManager::getAudioManager()
return Manager::instance().getAudioManager();
}
/*
void ConfigurationManager::setMailNotify()
{
Manager::instance().setMailNotify();
}
int32_t ConfigurationManager::getMailNotify()
{
return Manager::instance().getMailNotify();
}
std::map<std::string, int32_t> ConfigurationManager::getAddressbookSettings()
{
return Manager::instance().getAddressbookSettings();
}
void ConfigurationManager::setAddressbookSettings(const std::map<std::string, int32_t>& settings)
{
Manager::instance().setAddressbookSettings(settings);
}
std::vector<std::string> ConfigurationManager::getAddressbookList()
{
return Manager::instance().getAddressbookList();
}
void ConfigurationManager::setAddressbookList(const std::vector<std::string>& list)
{
Manager::instance().setAddressbookList(list);
}
*/
std::map<std::string, std::string> ConfigurationManager::getHookSettings()
{
return Manager::instance().hookPreference.toMap();

8
daemon/src/client/android/configurationmanager.h
View File

@ -108,14 +108,6 @@ class ConfigurationManager {
int32_t getHistoryLimit();
void clearHistory();
int32_t getMailNotify();
void setMailNotify();
std::map<std::string, int32_t> getAddressbookSettings();
void setAddressbookSettings(const std::map<std::string, int32_t>& settings);
std::vector< std::string > getAddressbookList();
void setAddressbookList(const std::vector< std::string >& list);
void setAccountsOrder(const std::string& order);
std::map<std::string, std::string> getHookSettings();

6
daemon/src/client/android/configurationmanager.i
View File

@ -115,12 +115,6 @@ public:
void setAudioManager(const std::string& api);
std::string getAudioManager();
/*void setMailNotify();
int32_t getMailNotify();
std::map<std::string, int32_t> getAddressbookSettings();
void setAddressbookSettings(const std::map<std::string, int32_t>& settings);
std::vector<std::string> getAddressbookList();
void setAddressbookList(const std::vector<std::string>& list);*/
std::map<std::string, std::string> getHookSettings();
void setHookSettings(const std::map<std::string, std::string>& settings);
void setAccountsOrder(const std::string& order);

7
daemon/src/managerimpl.cpp
View File

@ -190,7 +190,6 @@ void ManagerImpl::init(const std::string &config_file)
history_.load(preferences.getHistoryLimit());
registerAccounts();
INFO("init ended");
}
void ManagerImpl::setPath(const std::string &path) {
@ -616,7 +615,6 @@ bool ManagerImpl::offHoldCall(const std::string& callId)
//THREAD=Main
bool ManagerImpl::transferCall(const std::string& callId, const std::string& to)
{
DEBUG("transferCall");
if (isConferenceParticipant(callId)) {
removeParticipant(callId);
} else if (not isConference(getCurrentCallId()))
@ -2924,9 +2922,8 @@ void ManagerImpl::saveHistory()
{
if (!history_.save())
ERROR("Could not save history!");
client_.getConfigurationManager()->historyChanged();
else
client_.getConfigurationManager()->historyChanged();
}
void ManagerImpl::clearHistory()

26
daemon/src/managerimpl.h
View File

@ -645,32 +645,6 @@ class ManagerImpl {
*/
int getHistoryLimit() const;
/**
* Set the desktop mail notification level
*/
void setMailNotify();
/**
* Addressbook configuration
*/
std::map<std::string, int32_t> getAddressbookSettings() const;
/**
* Addressbook configuration
*/
void setAddressbookSettings(const std::map<std::string, int32_t>& settings);
/**
* Addressbook list
*/
void setAddressbookList(const std::vector< std::string >& list);
/**
* Addressbook list
*/
std::vector <std::string> getAddressbookList() const;
/**
* Configure the start-up option
* @return int 1 if SFLphone should start in the system tray