* 6560: password is now specific to IAX accounts

sflphone-common/src/account.h

@@ -273,13 +273,6 @@ class Account : public Serializable
             _hostname = hostname;
         }
 
-        std::string getPassword (void) const {
-            return _password;
-        }
-        void setPassword (const std::string &password) {
-            _password = password;
-        }
-
         std::string getAlias (void) const {
             return _alias;
         }
@@ -375,11 +368,6 @@ class Account : public Serializable
          */
         std::string _hostname;
 
-        /**
-         * Account login information: password
-         */
-        std::string _password;
-
         /**
          * Account login information: Alias
          */

sflphone-common/src/iax/iaxaccount.cpp

@@ -59,7 +59,7 @@ void IAXAccount::serialize (Conf::YamlEmitter *emitter)
 
     Conf::ScalarNode id (Account::_accountID);
     Conf::ScalarNode username (Account::_username);
-    Conf::ScalarNode password (Account::_password);
+    Conf::ScalarNode password (_password);
     Conf::ScalarNode alias (Account::_alias);
     Conf::ScalarNode hostname (Account::_hostname);
     Conf::ScalarNode enable (_enabled);
@@ -116,7 +116,7 @@ void IAXAccount::setAccountDetails (std::map<std::string, std::string> details)
     setType (details[CONFIG_ACCOUNT_TYPE]);
     setUsername (details[USERNAME]);
     setHostname (details[HOSTNAME]);
-    setPassword (details[PASSWORD]);
+    _password = (details[PASSWORD]);
     setEnabled ( (details[CONFIG_ACCOUNT_ENABLE].compare ("true") == 0));
     setMailBox (details[CONFIG_ACCOUNT_MAILBOX]);
 
@@ -171,7 +171,6 @@ int IAXAccount::registerVoIPLink()
         // Stuff needed for IAX registration
         setHostname (_hostname);
         setUsername (_username);
-        setPassword (_password);
 
         _link->sendRegister (_accountID);
 	}

sflphone-common/src/iax/iaxaccount.h

@@ -69,7 +69,16 @@ class IAXAccount : public Account
          */
         int unregisterVoIPLink();
 
+        const std::string &getPassword (void) const {
+        	return _password;
+        }
+
     private:
+
+        /**
+         * Account login information: password
+         */
+        std::string _password;
 };
 
 #endif

sflphone-common/src/sip/sipaccount.cpp

@@ -116,7 +116,6 @@ void SIPAccount::serialize (Conf::YamlEmitter *emitter)
 
     Conf::ScalarNode id (Account::_accountID);
     Conf::ScalarNode username (Account::_username);
-    Conf::ScalarNode password (Account::_password);
     Conf::ScalarNode alias (Account::_alias);
     Conf::ScalarNode hostname (Account::_hostname);
     Conf::ScalarNode enable (_enabled);