[ekiga] Disable -> Enable in preferences

From: Eugen Dedu <ededu src gnome org>
To: svn-commits-list gnome org
Subject: [ekiga] Disable -> Enable in preferences
Date: Thu, 30 Apr 2009 06:28:19 -0400 (EDT)
commit 8732833f170483f9d6de692f94ed7dcda73b5d71
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Thu Apr 30 12:27:16 2009 +0200

    Disable -> Enable in preferences
    
    The migration setting has not yet been done.
---
 ekiga.schemas.in.in                               |   68 ++++++++++----------
 lib/engine/components/opal/opal-gmconf-bridge.cpp |   12 ++--
 src/gui/preferences.cpp                           |    8 +-
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/ekiga.schemas.in.in b/ekiga.schemas.in.in
index 4593ea8..64bbcc1 100644
--- a/ekiga.schemas.in.in
+++ b/ekiga.schemas.in.in
@@ -88,7 +88,7 @@
 	<long>The maximum transmitted frame rate in frames/s. This rate may not be reached in case a minimum quality was configure via a TSTO value smaller than 31 and the bitrate selected is not sufficient to support this minimum quality</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/personal_data/full_name</key>
       <applyto>/apps/@PACKAGE_NAME@/general/personal_data/full_name</applyto>
       <owner>Ekiga</owner>
@@ -166,7 +166,7 @@
 	<long>The audio codecs list</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/enable_silence_detection</key>
       <applyto>/apps/@PACKAGE_NAME@/codecs/audio/enable_silence_detection</applyto>
       <owner>Ekiga</owner>
@@ -177,7 +177,7 @@
 	<long>If enabled, use silence detection with the codecs supporting it</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/enable_echo_cancelation</key>
       <applyto>/apps/@PACKAGE_NAME@/codecs/audio/enable_echo_cancelation</applyto>
       <owner>Ekiga</owner>
@@ -508,14 +508,14 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/general/nat/disable_stun</key>
-      <applyto>/apps/@PACKAGE_NAME@/general/nat/disable_stun</applyto>
+      <key>/schemas/apps/@PACKAGE_NAME@/general/nat/enable_stun</key>
+      <applyto>/apps/@PACKAGE_NAME@/general/nat/enable_stun</applyto>
       <owner>Ekiga</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
-	<short>Disable STUN network detection</short>
-	<long>Disable the automatic network setup resulting from the STUN test</long>
+	<short>Enable STUN network detection</short>
+	<long>Enable the automatic network setup resulting from the STUN test</long>
       </locale>
     </schema>
     <schema>
@@ -529,7 +529,7 @@
         <long>Enter the number of seconds after which Ekiga should try refreshing the NAT binding when STUN is being used</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/start_hidden</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/start_hidden</applyto>
       <owner>Ekiga</owner>
@@ -540,7 +540,7 @@
 	<long>If enabled, Ekiga will start hidden provided that the notification area is present in the GNOME panel</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/main_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/main_window/position</applyto>
       <owner>Ekiga</owner>
@@ -573,7 +573,7 @@
 	<long>Change the main window panel section</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/log_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/log_window/position</applyto>
       <owner>Ekiga</owner>
@@ -584,7 +584,7 @@
 	<long>Position on the screen of the log window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/chat_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/chat_window/size</applyto>
       <owner>Ekiga</owner>
@@ -595,7 +595,7 @@
 	<long>Size of the chat window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/chat_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/chat_window/position</applyto>
       <owner>Ekiga</owner>
@@ -606,7 +606,7 @@
 	<long>Position on the screen of the chat window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/druid_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/druid_window/size</applyto>
       <owner>Ekiga</owner>
@@ -617,7 +617,7 @@
 	<long>Size of the druid window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/druid_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/druid_window/position</applyto>
       <owner>Ekiga</owner>
@@ -628,7 +628,7 @@
 	<long>Position on the screen of the druid window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/address_book_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/address_book_window/position</applyto>
       <owner>Ekiga</owner>
@@ -639,7 +639,7 @@
 	<long>Position on the screen of the address book window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/address_book_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/address_book_window/size</applyto>
       <owner>Ekiga</owner>
@@ -650,7 +650,7 @@
 	<long>Size of the address book window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/audio_settings_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/audio_settings_window/position</applyto>
       <owner>Ekiga</owner>
@@ -661,7 +661,7 @@
 	<long>Position on the screen of the audio settings window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/audio_settings_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/audio_settings_window/size</applyto>
       <owner>Ekiga</owner>
@@ -672,7 +672,7 @@
 	<long>Size of the audio settings window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_settings_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_settings_window/position</applyto>
       <owner>Ekiga</owner>
@@ -683,7 +683,7 @@
 	<long>Position on the screen of the video settings window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_settings_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_settings_window/size</applyto>
       <owner>Ekiga</owner>
@@ -694,7 +694,7 @@
 	<long>Size of the video settings window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/preferences_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/preferences_window/position</applyto>
       <owner>Ekiga</owner>
@@ -705,7 +705,7 @@
 	<long>Position on the screen of the preferences window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/preferences_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/preferences_window/size</applyto>
       <owner>Ekiga</owner>
@@ -716,7 +716,7 @@
 	<long>Size of the preferences window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/accounts_window/position</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/accounts_window/position</applyto>
       <owner>Ekiga</owner>
@@ -727,7 +727,7 @@
 	<long>Position on the screen of the preferences window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/accounts_window/size</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/accounts_window/size</applyto>
       <owner>Ekiga</owner>
@@ -738,7 +738,7 @@
 	<long>Size of the preferences window</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_display/disable_hw_accel</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_display/disable_hw_accel</applyto>
       <owner>Ekiga</owner>
@@ -749,7 +749,7 @@
 	<long>This key disables DirectX (on win32) and XVideo (on Linux) video hardware acceleration</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_display/allow_pip_sw_scaling</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_display/allow_pip_sw_scaling</applyto>
       <owner>Ekiga</owner>
@@ -760,7 +760,7 @@
 	<long>Allow Ekiga to fall back to software scaling the picture-in-picture if hardware support is not available. If this is set to false, Ekiga will not try to open the PIP if hardware support is not available.</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_display/sw_scaling_algorithm</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_display/sw_scaling_algorithm</applyto>
       <owner>Ekiga</owner>
@@ -771,7 +771,7 @@
 	<long>Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. Does not apply on windows systems.</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_display/zoom</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_display/zoom</applyto>
       <owner>Ekiga</owner>
@@ -782,7 +782,7 @@
 	<long>The zoom value in percent to apply to images displayed in the main GUI (can be 50, 100, or 200)</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_display/stay_on_top</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_display/stay_on_top</applyto>
       <owner>Ekiga</owner>
@@ -804,7 +804,7 @@
 	<long>The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with local video in a separate window, 4: Both)</long>
       </locale>
     </schema>
-    <schema>	
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/video_display/video_view_before_fullscreen</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/video_display/video_view_before_fullscreen</applyto>
       <owner>Ekiga</owner>
@@ -915,7 +915,7 @@
 	<long>Whether to prefer to sustain the max. frame rate or lower it possibly in order to keep a minimum level of (spatial) quality for all frames. 0: Highest minimal quality, 31: lowest minimal quality</long>
       </locale>
     </schema>
-    <schema>		
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/contacts/roster_folded_groups</key>
       <applyto>/apps/@PACKAGE_NAME@/contacts/roster_folded_groups</applyto>
       <owner>Ekiga</owner>
@@ -927,7 +927,7 @@
 	<long></long>
       </locale>
     </schema>
-    <schema>		
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/contacts/show_offline_contacts</key>
       <applyto>/apps/@PACKAGE_NAME@/contacts/show_offline_contacts</applyto>
       <owner>Ekiga</owner>
@@ -938,7 +938,7 @@
 	<long>If enabled, offline contacts will be shown in the roster</long>
       </locale>
     </schema>
-    <schema>		
+    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/contacts/ldap_servers</key>
       <applyto>/apps/@PACKAGE_NAME@/contacts/ldap_servers</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 0083a93..e164162 100644
--- a/lib/engine/components/opal/opal-gmconf-bridge.cpp
+++ b/lib/engine/components/opal/opal-gmconf-bridge.cpp
@@ -107,10 +107,10 @@ ConfBridge::ConfBridge (Ekiga::Service & _service)
   keys.push_back (H323_KEY "enable_early_h245");
   keys.push_back (H323_KEY "enable_fast_start");
   keys.push_back (H323_KEY "dtmf_mode");
-  keys.push_back (H323_KEY "forward_host"); 
+  keys.push_back (H323_KEY "forward_host");
 
   keys.push_back (NAT_KEY "stun_server");
-  keys.push_back (NAT_KEY "disable_stun");
+  keys.push_back (NAT_KEY "enable_stun");
 
   load (keys);
 }
@@ -171,13 +171,13 @@ void ConfBridge::on_property_changed (std::string key, GmConfEntry *entry)
     const char *stun_server = gm_conf_entry_get_string (entry);
     manager.set_stun_server (stun_server ? stun_server : "stun.ekiga.net");
   }
-  else if (key == NAT_KEY "disable_stun") {
+  else if (key == NAT_KEY "enable_stun") {
 
-    manager.set_stun_enabled (!gm_conf_entry_get_bool (entry));
+    manager.set_stun_enabled (gm_conf_entry_get_bool (entry));
   }
 
 
-  // 
+  //
   // Jitter buffer configuration
   //
   else if (key == AUDIO_CODECS_KEY "maximum_jitter_buffer") {
@@ -186,7 +186,7 @@ void ConfBridge::on_property_changed (std::string key, GmConfEntry *entry)
   }
 
 
-  // 
+  //
   // Silence detection
   //
   else if (key == AUDIO_CODECS_KEY "enable_silence_detection") {
diff --git a/src/gui/preferences.cpp b/src/gui/preferences.cpp
index d401d24..35c9b47 100644
--- a/src/gui/preferences.cpp
+++ b/src/gui/preferences.cpp
@@ -449,7 +449,7 @@ gm_pw_init_general_page (GtkWidget *prefs_window,
   pw = gm_pw_get_pw (prefs_window);
 
   /* Personal Information */
-  subsection = 
+  subsection =
     gnome_prefs_subsection_new (prefs_window, container,
                                 _("Personal Information"), 2, 2);
 
@@ -480,16 +480,16 @@ gm_pw_init_interface_page (GtkWidget *prefs_window,
 
   /* Video Display */
   subsection =
-    gnome_prefs_subsection_new (prefs_window, container, 
+    gnome_prefs_subsection_new (prefs_window, container,
                                 _("Video Display"), 1, 2);
 
   gnome_prefs_toggle_new (subsection, _("Place windows displaying video _above other windows"), VIDEO_DISPLAY_KEY "stay_on_top", _("Place windows displaying video above other windows during calls"), 0);
 
   /* Network Settings */
-  subsection = gnome_prefs_subsection_new (prefs_window, container, 
+  subsection = gnome_prefs_subsection_new (prefs_window, container,
                                            _("Network Settings"), 1, 2);
 
-  gnome_prefs_toggle_new (subsection, _("Disable network _detection"), NAT_KEY "disable_stun", _("Disable the automatic network setup resulting from the STUN test"), 0);
+  gnome_prefs_toggle_new (subsection, _("Enable network _detection"), NAT_KEY "enable_stun", _("Enable the automatic network setup resulting from the STUN test"), 0);
 
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]