cheese r976 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Tue Sep  2 21:32:07 2008
New Revision: 976
URL: http://svn.gnome.org/viewvc/cheese?rev=976&view=rev

Log:
cheese crashes no more when no device is set in gconf, partially fixes bug #546868, courtesy of Hans de Goede


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

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Tue Sep  2 21:32:07 2008
@@ -9,6 +9,7 @@
   - Felix Kaser <f kaser gmx net>
   - Filippo Argiolas <filippo argiolas gmail com>
   - Gintautas Miliauskas <gintas akl lt>
+  - Hans de Goede <jwrdegoede fedoraproject org>
   - James Liggett <jrliggett cox net>
   - Luca Ferretti <elle uca libero it>
   - Mirco "MacSlow" MÃller <macslow bangang de>

Modified: trunk/src/cheese-prefs-webcam-combo.c
==============================================================================
--- trunk/src/cheese-prefs-webcam-combo.c	(original)
+++ trunk/src/cheese-prefs-webcam-combo.c	Tue Sep  2 21:32:07 2008
@@ -134,7 +134,7 @@
   if (num_devices > 0)
   {
     g_object_get (prefs_widget->gconf, priv->webcam_device_key, &gconf_device_name, NULL);
-    if (strcmp (selected_device->video_device, gconf_device_name) != 0)
+    if (!gconf_device_name || strcmp (selected_device->video_device, gconf_device_name) != 0)
     {
       g_object_set (prefs_widget->gconf, priv->webcam_device_key, selected_device->video_device, NULL);
     }