Skip to content
Snippets Groups Projects
Commit 01f62b02 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#3649] Remove gconf parameters from configuration manager

parent 303c50f2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sflphone-common/src/dbus/configurationmanager-introspec.xml 100644 → 100755
+ 0
− 210
View file @ 01f62b02
...@@ -633,21 +633,6 @@ ...@@ -633,21 +633,6 @@
</arg> </arg>
</method> </method>
<!--
<method name="setNotify" tp:name-for-bindings="setNotify">
<tp:docstring>
</tp:docstring>
</method>
<method name="getNotify" tp:name-for-bindings="getNotify">
<tp:docstring>
</tp:docstring>
<arg type="i" name="level" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
-->
<method name="setMailNotify" tp:name-for-bindings="setMailNotify"> <method name="setMailNotify" tp:name-for-bindings="setMailNotify">
<tp:docstring> <tp:docstring>
</tp:docstring> </tp:docstring>
...@@ -661,71 +646,7 @@ ...@@ -661,71 +646,7 @@
</tp:docstring> </tp:docstring>
</arg> </arg>
</method> </method>
<!--
<method name="getDialpad" tp:name-for-bindings="getDialpad">
<tp:docstring>
</tp:docstring>
<arg type="i" name="state" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setDialpad" tp:name-for-bindings="setDialpad">
<tp:docstring>
</tp:docstring>
<arg type="b" name="display" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getSearchbar" tp:name-for-bindings="getSearchbar">
<tp:docstring>
</tp:docstring>
<arg type="i" name="state" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setSearchbar" tp:name-for-bindings="setSearchbar">
<tp:docstring>
</tp:docstring>
</method>
<method name="setHistoryEnabled" tp:name-for-bindings="setHistoryEnabled">
<tp:docstring>
</tp:docstring>
</method>
<method name="getHistoryEnabled" tp:name-for-bindings="getHistoryEnabled">
<tp:docstring>
</tp:docstring>
<arg type="s" name="state" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getVolumeControls" tp:name-for-bindings="getVolumeControls">
<tp:docstring>
</tp:docstring>
<arg type="i" name="state" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setVolumeControls" tp:name-for-bindings="setVolumeControls">
<tp:docstring>
</tp:docstring>
<arg type="b" name="display" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
-->
<method name="getHistoryLimit" tp:name-for-bindings="getHistoryLimit"> <method name="getHistoryLimit" tp:name-for-bindings="getHistoryLimit">
<tp:docstring> <tp:docstring>
...@@ -744,137 +665,6 @@ ...@@ -744,137 +665,6 @@
</tp:docstring> </tp:docstring>
</arg> </arg>
</method> </method>
<!--
<method name="startHidden" tp:name-for-bindings="startHidden">
<tp:docstring>
</tp:docstring>
</method>
<method name="isStartHidden" tp:name-for-bindings="isStartHidden">
<tp:docstring>
</tp:docstring>
<arg type="i" name="state" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="popupMode" tp:name-for-bindings="popupMode">
<tp:docstring>
</tp:docstring>
<arg type="i" name="state" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="switchPopupMode" tp:name-for-bindings="switchPopupMode">
<tp:docstring>
</tp:docstring>
</method>
-->
<method name="getWindowWidth" tp:name-for-bindings="getWindowWidth">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="width" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getWindowHeight" tp:name-for-bindings="getWindowHeight">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="height" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setWindowWidth" tp:name-for-bindings="setWindowWidth">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="width" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setWindowHeight" tp:name-for-bindings="setWindowHeight">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="height" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getWindowPositionX" tp:name-for-bindings="getWindowPositionX">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="posX" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setWindowPositionX" tp:name-for-bindings="setWindowPositionX">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="posX" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="getWindowPositionY" tp:name-for-bindings="getWindowPositionY">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="posY" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="setWindowPositionY" tp:name-for-bindings="setWindowPositionY">
<tp:docstring>
Unused
</tp:docstring>
<arg type="i" name="posY" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
<method name="enableStatusIcon" tp:name-for-bindings="enableStatusIcon">
<tp:docstring>
Allow SFLphone icon to be displayed in system tray
</tp:docstring>
<arg type="s" name="value" direction="in">
<tp:docstring>
true/false
</tp:docstring>
</arg>
</method>
<method name="isStatusIconEnabled" tp:name-for-bindings="isStatusIconEnabled">
<tp:docstring>
Test if SFLphone icon is displayed in system tray.
</tp:docstring>
<arg type="s" name="value" direction="out">
<tp:docstring>
true/false
</tp:docstring>
</arg>
</method>
<!-- Addressbook configuration --> <!-- Addressbook configuration -->
......
sflphone-common/src/dbus/configurationmanager.cpp 100644 → 100755
+ 12
− 68
View file @ 01f62b02
...@@ -270,22 +270,20 @@ std::map<std::string, std::string> ConfigurationManager::getCredential( ...@@ -270,22 +270,20 @@ std::map<std::string, std::string> ConfigurationManager::getCredential(
streamOut << index; streamOut << index;
credentialIndex = streamOut.str(); credentialIndex = streamOut.str();
SIPAccount *sipaccount = (SIPAccount *)Manager::instance().getAccount(accountID);
std::string section = std::string("Credential") + std::string(":") std::string section = std::string("Credential") + std::string(":")
+ accountID + std::string(":") + credentialIndex; + accountID + std::string(":") + credentialIndex;
std::map<std::string, std::string> credentialInformation; std::map<std::string, std::string> credentialInformation;
std::string username = Manager::instance().getConfigString(section, std::string username = sipaccount->getUsername();
USERNAME); std::string password = sipaccount->getPassword();
std::string password = Manager::instance().getConfigString(section, std::string realm = sipaccount->getRealm();
PASSWORD);
std::string realm = Manager::instance().getConfigString(section, REALM); credentialInformation.insert(std::pair<std::string, std::string>(USERNAME, username));
credentialInformation.insert(std::pair<std::string, std::string>(PASSWORD, password));
credentialInformation.insert(std::pair<std::string, std::string>(USERNAME, credentialInformation.insert(std::pair<std::string, std::string>(REALM, realm));
username));
credentialInformation.insert(std::pair<std::string, std::string>(PASSWORD,
password));
credentialInformation.insert(std::pair<std::string, std::string>(REALM,
realm));
return credentialInformation; return credentialInformation;
} }
...@@ -520,17 +518,11 @@ std::vector<std::string> ConfigurationManager::getRecordDeviceList() { ...@@ -520,17 +518,11 @@ std::vector<std::string> ConfigurationManager::getRecordDeviceList() {
} }
bool ConfigurationManager::isMd5CredentialHashing(void) { bool ConfigurationManager::isMd5CredentialHashing(void) {
bool isEnabled = Manager::instance().getConfigBool(PREFERENCES, return Manager::instance().preferences.getMd5Hash();
CONFIG_MD5HASH);
return isEnabled;
} }
void ConfigurationManager::setMd5CredentialHashing(const bool& enabled) { void ConfigurationManager::setMd5CredentialHashing(const bool& enabled) {
if (enabled) { Manager::instance().preferences.setMd5Hash(enabled);
Manager::instance().setConfig(PREFERENCES, CONFIG_MD5HASH, TRUE_STR);
} else {
Manager::instance().setConfig(PREFERENCES, CONFIG_MD5HASH, FALSE_STR);
}
} }
int32_t ConfigurationManager::isIax2Enabled(void) { int32_t ConfigurationManager::isIax2Enabled(void) {
...@@ -720,45 +712,6 @@ std::vector<std::string> ConfigurationManager::getAllIpInterfaceByName(void) { ...@@ -720,45 +712,6 @@ std::vector<std::string> ConfigurationManager::getAllIpInterfaceByName(void) {
return vector; return vector;
} }
int32_t ConfigurationManager::getWindowWidth(void) {
return Manager::instance().getConfigInt(PREFERENCES, WINDOW_WIDTH);
}
int32_t ConfigurationManager::getWindowHeight(void) {
return Manager::instance().getConfigInt(PREFERENCES, WINDOW_HEIGHT);
}
void ConfigurationManager::setWindowWidth(const int32_t& width) {
Manager::instance().setConfig(PREFERENCES, WINDOW_WIDTH, width);
}
void ConfigurationManager::setWindowHeight(const int32_t& height) {
Manager::instance().setConfig(PREFERENCES, WINDOW_HEIGHT, height);
}
int32_t ConfigurationManager::getWindowPositionX(void) {
return Manager::instance().getConfigInt(PREFERENCES, WINDOW_POSITION_X);
}
int32_t ConfigurationManager::getWindowPositionY(void) {
return Manager::instance().getConfigInt(PREFERENCES, WINDOW_POSITION_Y);
}
void ConfigurationManager::setWindowPositionX(const int32_t& posX) {
Manager::instance().setConfig(PREFERENCES, WINDOW_POSITION_X, posX);
}
void ConfigurationManager::setWindowPositionY(const int32_t& posY) {
Manager::instance().setConfig(PREFERENCES, WINDOW_POSITION_Y, posY);
}
std::map<std::string, int32_t> ConfigurationManager::getShortcuts() { std::map<std::string, int32_t> ConfigurationManager::getShortcuts() {
...@@ -791,12 +744,3 @@ void ConfigurationManager::setShortcuts( ...@@ -791,12 +744,3 @@ void ConfigurationManager::setShortcuts(
Manager::instance().saveConfig(); Manager::instance().saveConfig();
} }
void ConfigurationManager::enableStatusIcon (const std::string& value) {
Manager::instance ().setConfig (PREFERENCES, SHOW_STATUSICON, value);
}
std::string ConfigurationManager::isStatusIconEnabled (void) {
return Manager::instance ().getConfigString (PREFERENCES, SHOW_STATUSICON);
}
sflphone-common/src/dbus/configurationmanager.h 100644 → 100755
+ 1
− 30
View file @ 01f62b02
...@@ -109,43 +109,14 @@ public: ...@@ -109,43 +109,14 @@ public:
void setRingtoneChoice( const std::string& tone ); void setRingtoneChoice( const std::string& tone );
std::string getRecordPath( void ); std::string getRecordPath( void );
void setRecordPath(const std::string& recPath ); void setRecordPath(const std::string& recPath );
/*
int32_t getDialpad( void );
void setDialpad (const bool& display);
int32_t getSearchbar( void );
void setSearchbar( void );
*/
void setHistoryLimit( const int32_t& days); void setHistoryLimit( const int32_t& days);
int32_t getHistoryLimit (void); int32_t getHistoryLimit (void);
/*
void setHistoryEnabled (void);
std::string getHistoryEnabled (void);
int32_t getVolumeControls( void );
void setVolumeControls (const bool& display);
int32_t isStartHidden( void );
void startHidden( void );
int32_t popupMode( void );
void switchPopupMode( void );
int32_t getNotify( void );
void setNotify( void );
*/
int32_t getMailNotify( void ); int32_t getMailNotify( void );
void setMailNotify( void ); void setMailNotify( void );
int32_t getWindowWidth (void);
int32_t getWindowHeight (void);
void setWindowWidth (const int32_t& width);
void setWindowHeight (const int32_t& height);
int32_t getWindowPositionX (void);
int32_t getWindowPositionY (void);
void setWindowPositionX (const int32_t& posX);
void setWindowPositionY (const int32_t& posY);
void enableStatusIcon (const std::string&);
std::string isStatusIconEnabled (void);
std::map<std::string, int32_t> getAddressbookSettings (void); std::map<std::string, int32_t> getAddressbookSettings (void);
void setAddressbookSettings (const std::map<std::string, int32_t>& settings); void setAddressbookSettings (const std::map<std::string, int32_t>& settings);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment