cheese r600 - in branches/gnome-2-22: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Mon Mar 17 22:13:18 2008
New Revision: 600
URL: http://svn.gnome.org/viewvc/cheese?rev=600&view=rev

Log:
set the max waiting time for detecting a camera to 10 seconds, fixes bug #520394


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/cheese-webcam.c

Modified: branches/gnome-2-22/src/cheese-webcam.c
==============================================================================
--- branches/gnome-2-22/src/cheese-webcam.c	(original)
+++ branches/gnome-2-22/src/cheese-webcam.c	Mon Mar 17 22:13:18 2008
@@ -483,9 +483,9 @@
     pipeline = gst_parse_launch (pipeline_desc, &err);
     if ((pipeline != NULL) && (err == NULL))
     {
-      /* Start the pipeline and wait for max. 3 seconds for it to start up */
+      /* Start the pipeline and wait for max. 10 seconds for it to start up */
       gst_element_set_state (pipeline, GST_STATE_PLAYING);
-      ret = gst_element_get_state (pipeline, NULL, NULL, 3 * GST_SECOND);
+      ret = gst_element_get_state (pipeline, NULL, NULL, 10 * GST_SECOND);
 
       /* Check if any error messages were posted on the bus */
       bus = gst_element_get_bus (pipeline);