[ekiga] Modified and fixed the TOS feature

[Julien Puydt <jpuydt src gnome org>]

commit bbb360eb6086fb450fafcce60b986fa439436248
Author: Snark <jpuydt gnome org>
Date:   Sat Oct 16 09:26:58 2010 +0200

    Modified and fixed the TOS feature
    
    Moved the key in another part of the schema, and made it really used.
    
    Patch from Zoran Pericic. Thanks!

 ekiga.schemas.in.in                               |   22 ++++++++++----------
 lib/engine/components/opal/opal-gmconf-bridge.cpp |   10 +++++---
 2 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/ekiga.schemas.in.in b/ekiga.schemas.in.in
index 1da7f9e..b373fc1 100644
--- a/ekiga.schemas.in.in
+++ b/ekiga.schemas.in.in
@@ -322,6 +322,17 @@
       </locale>
     </schema>
     <schema>
+      <key>/schemas/apps/@PACKAGE_NAME@/protocols/rtp_tos_field</key>
+      <applyto>/apps/@PACKAGE_NAME@/protocols/rtp_tos_field</applyto>
+      <owner>Ekiga</owner>
+      <type>int</type>
+      <default>184</default>
+      <locale name="C">
+        <short>Type of Service (TOS) byte on outgoing RTP IP packets</short>
+        <long>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) correspond to Expedited Forwarding (EF) PHB as defined in RFC 3246.</long>
+      </locale>
+    </schema>
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/protocols/interface</key>
       <applyto>/apps/@PACKAGE_NAME@/protocols/interface</applyto>
       <owner>Ekiga</owner>
@@ -409,17 +420,6 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/protocols/ports/rtp_tos_field</key>
-      <applyto>/apps/@PACKAGE_NAME@/protocols/ports/rtp_tos_field</applyto>
-      <owner>Ekiga</owner>
-      <type>int</type>
-      <default>184</default>
-      <locale name="C">
-        <short>RTP TOS field</short>
-        <long>Set IP header TOS field for RTP packages.</long>
-      </locale>
-    </schema>
-    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/protocols/h323/enable_h245_tunneling</key>
       <applyto>/apps/@PACKAGE_NAME@/protocols/h323/enable_h245_tunneling</applyto>
       <owner>Ekiga</owner>
diff --git a/lib/engine/components/opal/opal-gmconf-bridge.cpp b/lib/engine/components/opal/opal-gmconf-bridge.cpp
index 25d4b81..d593fad 100644
--- a/lib/engine/components/opal/opal-gmconf-bridge.cpp
+++ b/lib/engine/components/opal/opal-gmconf-bridge.cpp
@@ -73,6 +73,8 @@ ConfBridge::ConfBridge (Ekiga::Service & _service)
   Ekiga::ConfKeys keys;
   property_changed.connect (boost::bind (&ConfBridge::on_property_changed, this, _1, _2));
 
+  keys.push_back (PROTOCOLS_KEY "rtp_tos_field");
+
   keys.push_back (PORTS_KEY "udp_port_range");
   keys.push_back (PORTS_KEY "tcp_port_range");
 
@@ -365,6 +367,10 @@ void ConfBridge::on_property_changed (std::string key, GmConfEntry *entry)
 
     manager.set_auto_answer (gm_conf_entry_get_bool (entry));
   }
+  else if (key == PROTOCOLS_KEY "rtp_tos_field") {
+
+    manager.set_rtp_tos (gm_conf_entry_get_int (entry));
+  }
 
 
   //
@@ -396,9 +402,5 @@ void ConfBridge::on_property_changed (std::string key, GmConfEntry *entry)
 
     g_strfreev (couple);
   }
-  else if (key == PORTS_KEY "rtp_tos_field") {
-
-    manager.set_rtp_tos (gm_conf_entry_get_int (entry));
-  }
 
 }