ekiga r6149 - in trunk: . src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Tue Apr  8 20:02:09 2008
New Revision: 6149
URL: http://svn.gnome.org/viewvc/ekiga?rev=6149&view=rev

Log:
Allow to enable/disable device error boxes
when popping up or via preferences.



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	Tue Apr  8 20:02:09 2008
@@ -675,6 +675,17 @@
 	<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	Tue Apr  8 20:02:09 2008
@@ -1090,7 +1090,7 @@
   }
 
   gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (GTK_WIDGET (self)),
-                                         VIDEO_DEVICES_KEY "enable_preview",
+                                         USER_INTERFACE_KEY "show_device_warnings",
                                          dialog_title,
                                          "%s", dialog_msg);
   g_free (dialog_msg);
@@ -1155,7 +1155,7 @@
   }
 
   gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (GTK_WIDGET (self)),
-                                         VIDEO_DEVICES_KEY "enable_preview", //FIXME
+                                         USER_INTERFACE_KEY "show_device_warnings",
                                          dialog_title,
                                          "%s", dialog_msg);
   g_free (dialog_msg);
@@ -1230,7 +1230,7 @@
   }
 
   gnomemeeting_warning_dialog_on_widget (GTK_WINDOW (GTK_WIDGET (self)),
-                                         VIDEO_DEVICES_KEY "enable_preview", //FIXME
+                                         USER_INTERFACE_KEY "show_device_warnings",
                                          dialog_title,
                                          "%s", dialog_msg);
   g_free (dialog_msg);

Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp	(original)
+++ trunk/src/gui/preferences.cpp	Tue Apr  8 20:02:09 2008
@@ -416,17 +416,13 @@
   /* GnomeMeeting GUI */
   subsection =
     gnome_prefs_subsection_new (prefs_window, container,
-                                _("Ekiga GUI"), 1, 2);
+                                _("Ekiga GUI"), 3, 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"), 1);
+  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, _("_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);
 
-  /* 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);
+  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);
   
   /* Auto Away */
   subsection =