Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/account_schema.h

@@ -55,6 +55,9 @@ static const char *const CONFIG_RINGTONE_PATH                = "Account.ringtone
 static const char *const CONFIG_RINGTONE_ENABLED                = "Account.ringtoneEnabled";
 static const char *const CONFIG_KEEP_ALIVE_ENABLED              = "Account.keepAliveEnabled";
 
+
+static const char *const CONFIG_DEFAULT_REGISTRATION_EXPIRE     = "60";
+
 static const char *const CONFIG_ACCOUNT_HOSTNAME                = "Account.hostname";
 static const char *const CONFIG_ACCOUNT_USERNAME                = "Account.username";
 static const char *const CONFIG_ACCOUNT_ROUTESET                = "Account.routeset";
@@ -68,6 +71,10 @@ static const char *const CONFIG_PUBLISHED_SAMEAS_LOCAL       = "Account.publishe
 static const char *const CONFIG_LOCAL_PORT                      = "Account.localPort";
 static const char *const CONFIG_PUBLISHED_PORT                  = "Account.publishedPort";
 static const char *const CONFIG_PUBLISHED_ADDRESS               = "Account.publishedAddress";
+static const char *const CONFIG_DEFAULT_LOCAL_PORT              = "5060";
+static const char *const CONFIG_DEFAULT_PUBLISHED_PORT          = "5060";
+static const char *const CONFIG_DEFAULT_PUBLISHED_SAMEAS_LOCAL  = "true";
+static const char *const CONFIG_DEFAULT_LOCAL_INTERFACE         = "default";
 
 static const char *const CONFIG_DISPLAY_NAME                    = "Account.displayName";
 static const char *const CONFIG_DEFAULT_ADDRESS                 = "0.0.0.0";

daemon/src/dbus/configurationmanager-introspec.xml

@@ -6,6 +6,12 @@
             Used to handle the configuration stuff: accounts settings, account registration, user preferences, ...
         </tp:docstring>
 
+        <method name="getAccountTemplate" tp:name-for-bindings="getAccountTemplate">
+            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+            <arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
+            </arg>
+        </method>
+
         <method name="getAccountDetails" tp:name-for-bindings="getAccountDetails">
             <tp:docstring>
                 Get all parameters of the specified account.

daemon/src/dbus/configurationmanager.cpp

@@ -150,6 +150,18 @@ void ConfigurationManager::registerAllAccounts()
     Manager::instance().registerAllAccounts();
 }
 
+///This function is used as a base for new accounts for clients that support it
+std::map<std::string, std::string> ConfigurationManager::getAccountTemplate()
+{
+   std::map<std::string, std::string> accTemplate;
+   accTemplate[ CONFIG_LOCAL_PORT                  ] = CONFIG_DEFAULT_LOCAL_PORT;
+   accTemplate[ CONFIG_PUBLISHED_PORT              ] = CONFIG_DEFAULT_PUBLISHED_PORT;
+   accTemplate[ CONFIG_PUBLISHED_SAMEAS_LOCAL      ] = CONFIG_DEFAULT_PUBLISHED_SAMEAS_LOCAL;
+   accTemplate[ CONFIG_LOCAL_INTERFACE             ] = CONFIG_DEFAULT_LOCAL_INTERFACE;
+   accTemplate[ CONFIG_ACCOUNT_REGISTRATION_EXPIRE ] = CONFIG_DEFAULT_REGISTRATION_EXPIRE;
+   return accTemplate;
+}
+
 std::string ConfigurationManager::addAccount(const std::map<std::string, std::string>& details)
 {
     return Manager::instance().addAccount(details);

daemon/src/dbus/configurationmanager.h

@@ -61,6 +61,7 @@ class ConfigurationManager
         ConfigurationManager(DBus::Connection& connection);
         std::map< std::string, std::string > getAccountDetails(const std::string& accountID);
         void setAccountDetails(const std::string& accountID, const std::map< std::string, std::string >& details);
+        std::map<std::string, std::string> getAccountTemplate();
         std::string addAccount(const std::map< std::string, std::string >& details);
         void removeAccount(const std::string& accoundID);
         void deleteAllCredential(const std::string& accountID);