[ekiga/ds-opal-refactoring] SIP: Renamed NAT Binding timeout into keepalive interval. Use OPTIONS.

[Damien Sandras <dsandras src gnome org>]

commit ca5cebaefc6c2b44bd2d7c9d60df93ef7913399d
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Apr 11 11:14:21 2015 +0200

    SIP: Renamed NAT Binding timeout into keepalive interval. Use OPTIONS.
    
    This is more intuitive. Actually, NAT Binding was misleading because TCP
    connections should be kept alive even when NAT is not involved. By
    default, we now use OPTIONS requests.

 lib/engine/components/opal/sip-call-manager.cpp |    8 ++++----
 org.gnome.ekiga.gschema.xml.in.in               |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index 1a69ff5..d058e22 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -167,10 +167,10 @@ void Opal::Sip::CallManager::setup (const std::string & setting)
   if (setting.empty () || setting == "listen-port")  {
     set_listen_port (sip_settings->get_int ("listen-port"));
   }
-  if (setting.empty () || setting == "binding-timeout")  {
-    int delay = sip_settings->get_int ("binding-timeout");
-    PTRACE (4, "Opal::Sip::CallManager\tNat binding delay set to " << delay);
-    sip_endpoint.SetKeepAlive (PTimeInterval (0, delay), SIPEndPoint::KeepAliveByCRLF);
+  if (setting.empty () || setting == "keepalive-interval")  {
+    int delay = sip_settings->get_int ("keepalive-interval");
+    PTRACE (4, "Opal::Sip::CallManager\tKeepalive interval set to " << delay);
+    sip_endpoint.SetKeepAlive (PTimeInterval (0, delay), SIPEndPoint::KeepAliveByOPTION);
   }
   if (setting.empty () || setting == "outbound-proxy-host")  {
     std::string uri = sip_settings->get_string ("outbound-proxy-host");
diff --git a/org.gnome.ekiga.gschema.xml.in.in b/org.gnome.ekiga.gschema.xml.in.in
index 1b55896..90b5b81 100644
--- a/org.gnome.ekiga.gschema.xml.in.in
+++ b/org.gnome.ekiga.gschema.xml.in.in
@@ -433,11 +433,11 @@
       <_summary>DTMF transmission</_summary>
       <_description>Select the mode for DTMFs transmission. The values can be 'rfc2833' (for "RFC2833") and 
'info' (for "SIP INFO")</_description>
     </key>
-    <key name="binding-timeout" type="i">
+    <key name="keepalive-interval" type="i">
       <range min="5" max="600"/>
-      <default>10</default>
-      <_summary>NAT Binding Timeout</_summary>
-      <_description>Enter the number of seconds after which Ekiga should try refreshing the NAT binding when 
STUN is being used</_description>
+      <default>30</default>
+      <_summary>Connection keepalive interval</_summary>
+      <_description>Enter the number of seconds between keepalive messages sent by Ekiga to maintain the 
connection</_description>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org gnome  PACKAGE_NAME@.protocols.h323" 
path="/org/gnome/@PACKAGE_NAME@/protocols/h323/">