cheese r592 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Thu Mar 13 12:32:22 2008
New Revision: 592
URL: http://svn.gnome.org/viewvc/cheese?rev=592&view=rev

Log:
cheese doesn't open the webcam device set in gconf, courtesy of Sjoerd Simons, fixes bug #522198


Modified:
   trunk/ChangeLog
   trunk/src/cheese-webcam.c
   trunk/src/cheese-webcam.h
   trunk/src/cheese-window.c

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Thu Mar 13 12:32:22 2008
@@ -1081,13 +1081,19 @@
 cheese_webcam_init (CheeseWebcam *webcam)
 {
   CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
-  gboolean ok;
 
   priv->is_recording = FALSE;
   priv->pipeline_is_playing = FALSE;
   priv->photo_filename = NULL;
   priv->webcam_devices = NULL;
   priv->device_name = NULL;
+}
+
+void
+cheese_webcam_setup (CheeseWebcam *webcam)
+{
+  CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
+  gboolean ok = TRUE;
 
   cheese_webcam_detect_webcam_devices (webcam);
   cheese_webcam_create_video_display_bin (webcam);
@@ -1115,6 +1121,7 @@
   gdk_threads_leave();
 }
 
+
 CheeseWebcam*
 cheese_webcam_new (GtkWidget* video_window, char *webcam_device_name)
 {
@@ -1122,7 +1129,7 @@
   if (webcam_device_name)
   {
     webcam = g_object_new (CHEESE_TYPE_WEBCAM, "video-window", video_window, 
-                           "device_name", webcam_device_name, NULL);
+                           "device-name", webcam_device_name, NULL);
   }
   else
   {

Modified: trunk/src/cheese-webcam.h
==============================================================================
--- trunk/src/cheese-webcam.h	(original)
+++ trunk/src/cheese-webcam.h	Thu Mar 13 12:32:22 2008
@@ -67,6 +67,7 @@
 
 GType		 cheese_webcam_get_type			(void);
 CheeseWebcam 	*cheese_webcam_new 			(GtkWidget *video_window, char *webcam_device_name);
+void 		 cheese_webcam_setup 			(CheeseWebcam *webcam);
 void 		 cheese_webcam_play 			(CheeseWebcam *webcam);
 void 		 cheese_webcam_stop 			(CheeseWebcam *webcam);
 void 		 cheese_webcam_set_effect 		(CheeseWebcam *webcam, CheeseWebcamEffect effect);

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Thu Mar 13 12:32:22 2008
@@ -1202,6 +1202,8 @@
   cheese_window->webcam = cheese_webcam_new (cheese_window->screen, webcam_device);
   g_free (webcam_device);
 
+  cheese_webcam_setup (cheese_window->webcam);
+
   g_signal_connect (cheese_window->webcam, "photo-saved",
                     G_CALLBACK (cheese_window_photo_saved_cb), cheese_window);
   g_signal_connect (cheese_window->webcam, "video-saved",