[ekiga/ds-opal-refactoring] Opal: Officially drop STUN.

[Damien Sandras <dsandras src gnome org>]

commit 42ab637514228bd6c1b21dfa14319f868b18d179
Author: Damien Sandras <dsandras seconix com>
Date:   Sun Apr 12 15:26:03 2015 +0200

    Opal: Officially drop STUN.
    
    STUN is not a good way of handling NAT problems. Modern clients should
    either rely on ICE (that we do not support yet) or rely on providers
    that support NAT traversal transparently for the client.
    
    Early versions of STUN have been deprecated.
    
    We will move Ekiga.net to support this.

 ekiga.convert.in                                   |    1 -
 .../components/opal/process/opal-endpoint.cpp      |    6 ++----
 lib/engine/gui/gtk-frontend/preferences-window.cpp |    4 ----
 org.gnome.ekiga.gschema.xml.in.in                  |    2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/ekiga.convert.in b/ekiga.convert.in
index 197cb73..9011fa4 100644
--- a/ekiga.convert.in
+++ b/ekiga.convert.in
@@ -31,7 +31,6 @@ busy-tone-sound = /apps/@PACKAGE_NAME@/general/sound_events/busy_tone_sound
 
 [org gnome  PACKAGE_NAME@.general.nat]
 stun-server = /apps/@PACKAGE_NAME@/general/nat/stun_server
-enable-stun = /apps/@PACKAGE_NAME@/general/nat/enable_stun
 
 [org gnome  PACKAGE_NAME@.general.user-interface.main-window]
 panel-section = /apps/@PACKAGE_NAME@/general/user_interface/main_window/panel_section
diff --git a/lib/engine/components/opal/process/opal-endpoint.cpp 
b/lib/engine/components/opal/process/opal-endpoint.cpp
index a9791b1..b741117 100644
--- a/lib/engine/components/opal/process/opal-endpoint.cpp
+++ b/lib/engine/components/opal/process/opal-endpoint.cpp
@@ -569,10 +569,8 @@ Opal::EndPoint::HandleSTUNResult ()
 
   if (error) {
 
-    ReportSTUNError (_("Ekiga did not manage to configure your network settings automatically. You can"
-                      " still use it, but you need to configure your network settings manually.\n\n"
-                      "Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually for"
-                      " instructions"));
+    ReportSTUNError (_("Ekiga did not manage to configure your network settings automatically. We suggest"
+                      " you disable STUN support and relay on a SIP provider that supports NAT 
environments.\n\n");
     ready ();
   }
   else if (!got_answer) {
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp 
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index f22e0c4..e19082d 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -594,10 +594,6 @@ gm_pw_init_general_page (PreferencesWindow *self,
                   _("The Type of Service (TOS) byte on outgoing RTP IP packets. This byte is used by the 
network to provide some level of Quality of Service (QoS). Default value 184 (0xB8) corresponds to Expedited 
Forwarding (EF) PHB as defined in RFC 3246."),
                   0.0, 255.0, 1.0);
 
-  gm_pw_toggle_new (container, _("Enable network _detection"),
-                    self->priv->nat_settings, "enable-stun",
-                    _("Enable the automatic network setup resulting from the STUN test"));
-
   /* Blacklist Settings */
   gm_pw_subsection_new (container, _("Blacklist"));
   GtkWidget* edit_blacklist_button = gtk_button_new_with_label(_("Edit"));
diff --git a/org.gnome.ekiga.gschema.xml.in.in b/org.gnome.ekiga.gschema.xml.in.in
index 90b5b81..6568900 100644
--- a/org.gnome.ekiga.gschema.xml.in.in
+++ b/org.gnome.ekiga.gschema.xml.in.in
@@ -185,7 +185,7 @@
       <_description>The STUN server to use for STUN Support. STUN is a technology that permits passage 
through some types of NAT gateway</_description>
     </key>
     <key name="enable-stun" type="b">
-      <default>true</default>
+      <default>false</default>
       <_summary>Enable STUN network detection</_summary>
       <_description>Enable the automatic network setup resulting from the STUN test</_description>
     </key>