cheese r855 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Thu Aug  7 00:12:57 2008
New Revision: 855
URL: http://svn.gnome.org/viewvc/cheese?rev=855&view=rev

Log:
correct critical warnings, if some gstreamer plugins arent available, fixes bug #522009, courtesy of Todd Eisenberger


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

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Thu Aug  7 00:12:57 2008
@@ -18,6 +18,7 @@
   - Steve Magoun <steve magoun canonical com>
   - Thomas Perl <thp perli ne>
   - Tim Philipp MÃller <tim centricular net>
+  - Todd Eisenberger <teisenberger gmail com>
   - Tommi Vainikainen <thv iki fi>
 
 icon-work

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Thu Aug  7 00:12:57 2008
@@ -1352,6 +1352,8 @@
     cheese_webcam_set_device_by_dev_udi (webcam, hal_dev_udi);
   }
 
+  priv->pipeline = gst_pipeline_new ("pipeline");
+
   cheese_webcam_create_video_display_bin (webcam, &tmp_error);
   if (tmp_error != NULL)
   {
@@ -1373,8 +1375,6 @@
     return;
   }
 
-  priv->pipeline = gst_pipeline_new ("pipeline");
-
   gst_bin_add_many (GST_BIN (priv->pipeline), priv->video_display_bin, 
                     priv->photo_save_bin, NULL);
 

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Thu Aug  7 00:12:57 2008
@@ -1533,6 +1533,8 @@
     cheese_window_cmd_close (NULL, cheese_window);
 
     gdk_threads_leave ();
+
+    return;
   }
 
   g_signal_connect (cheese_window->webcam, "photo-saved",