ekiga r6203 - in trunk: . src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Thu Apr 17 06:13:25 2008
New Revision: 6203
URL: http://svn.gnome.org/viewvc/ekiga?rev=6203&view=rev

Log:
Removed unneccessary gconf key. Improve debugging with user
plane support for the codecs.


Modified:
   trunk/ChangeLog
   trunk/ekiga.schemas.in.in
   trunk/src/gui/main.cpp
   trunk/src/gui/preferences.cpp

Modified: trunk/ekiga.schemas.in.in
==============================================================================
--- trunk/ekiga.schemas.in.in	(original)
+++ trunk/ekiga.schemas.in.in	Thu Apr 17 06:13:25 2008
@@ -664,17 +664,6 @@
 	<long>If enabled, Ekiga will start hidden provided that the notification area is present in the GNOME panel</long>
       </locale>
     </schema>
-    <schema>	
-      <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/show_device_warnings</key>
-      <applyto>/apps/@PACKAGE_NAME@/general/user_interface/show_device_warnings</applyto>
-      <owner>Ekiga</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-	<short>Show device warnings</short>
-	<long>If enabled, Ekiga will pop up a warning each time a audio/video input or output device could not be opened.</long>
-      </locale>
-    </schema>
     <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/general/user_interface/show_popup</key>
       <applyto>/apps/@PACKAGE_NAME@/general/user_interface/show_popup</applyto>

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Apr 17 06:13:25 2008
@@ -1080,7 +1080,7 @@
   }
 
   gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (GTK_WIDGET (self)),
-                                         USER_INTERFACE_KEY "show_device_warnings",
+                                         "show_device_warnings",
                                          dialog_title,
                                          "%s", dialog_msg);
   g_free (dialog_msg);
@@ -1152,7 +1152,7 @@
   }
 
   gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (GTK_WIDGET (self)),
-                                         USER_INTERFACE_KEY "show_device_warnings",
+                                         "show_device_warnings",
                                          dialog_title,
                                          "%s", dialog_msg);
   g_free (dialog_msg);
@@ -1237,7 +1237,7 @@
   }
 
   gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (GTK_WIDGET (self)),
-                                         USER_INTERFACE_KEY "show_device_warnings",
+                                         "show_device_warnings",
                                          dialog_title,
                                          "%s", dialog_msg);
   g_free (dialog_msg);
@@ -4279,6 +4279,7 @@
   gchar *title = NULL;
 
   int debug_level = 0;
+  int debug_level_up = 0;
   int error = -1;
 #ifdef HAVE_GNOME
   GnomeProgram *program;
@@ -4323,7 +4324,12 @@
     {
       {
 	"debug", 'd', 0, G_OPTION_ARG_INT, &debug_level, 
-       N_("Prints debug messages in the console (level between 1 and 6)"), 
+       N_("Prints debug messages in the console (level between 1 and 4)"), 
+       NULL
+      },
+      {
+	"debug_user_plane", 'u', 0, G_OPTION_ARG_INT, &debug_level_up, 
+       N_("Prints user plane debug messages in the console (level between 1 and 4)"), 
        NULL
       },
       {
@@ -4357,14 +4363,20 @@
 
 #ifndef WIN32
   char* text_label =  g_strdup_printf ("%d", debug_level);
-  setenv ("PWLIB_TRACE_CODECS", text_label, TRUE);
+  setenv ("PTLIB_TRACE_CODECS", text_label, TRUE);
+  g_free (text_label);
+  text_label =  g_strdup_printf ("%d", debug_level_up);
+  setenv ("PTLIB_TRACE_CODECS_USER_PLANE", text_label, TRUE);
   g_free (text_label);
 #else
-  char* text_label =  g_strdup_printf ("PWLIB_TRACE_CODECS=%d", debug_level);
+  char* text_label =  g_strdup_printf ("PTLIB_TRACE_CODECS=%d", debug_level);
+  _putenv (text_label);
+  g_free (text_label);
+  text_label =  g_strdup_printf ("PTLIB_TRACE_CODECS_USER_PLANE=%d", debug_level_up);
   _putenv (text_label);
   g_free (text_label);
 #endif
-  
+
   /* Ekiga initialisation */
   static GnomeMeeting instance;
 

Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp	(original)
+++ trunk/src/gui/preferences.cpp	Thu Apr 17 06:13:25 2008
@@ -416,13 +416,17 @@
   /* GnomeMeeting GUI */
   subsection =
     gnome_prefs_subsection_new (prefs_window, container,
-                                _("Ekiga GUI"), 3, 2);
+                                _("Ekiga GUI"), 1, 2);
 
-  gnome_prefs_toggle_new (subsection, _("Start _hidden"), USER_INTERFACE_KEY "start_hidden", _("If enabled, Ekiga will start hidden provided that the notification area is present in the GNOME panel"), 0);
+  gnome_prefs_toggle_new (subsection, _("Start _hidden"), USER_INTERFACE_KEY "start_hidden", _("If enabled, Ekiga will start hidden provided that the notification area is present in the GNOME panel"), 1);
 
-  gnome_prefs_toggle_new (subsection, _("_Warn if input or output devices could not be opened"), USER_INTERFACE_KEY "show_device_warnings", _("Show a warning message if  input or output devices could not be opened"), 1);
 
-  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"), 2);
+  /* Video Display */
+  subsection =
+    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);
   
   /* Auto Away */
   subsection =