r15057 - in /desktop/unstable/cheese/debian: changelog patches/00_fix_crash_on_init.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Thu Mar 13 09:32:01 2008
New Revision: 15057

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15057
Log:
* debian/patches/00_fix_crash_on_init.patch:
  + Added. Fixed crash on intialisation because of running strcmp on NULL.
    (From upstream svn)

Added:
    desktop/unstable/cheese/debian/patches/00_fix_crash_on_init.patch
Modified:
    desktop/unstable/cheese/debian/changelog

Modified: desktop/unstable/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/changelog?rev=15057&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/changelog (original)
+++ desktop/unstable/cheese/debian/changelog Thu Mar 13 09:32:01 2008
@@ -8,8 +8,11 @@
     pkg-gnome procedures
   * debian/control: Update vcs urls
   * debian/control: Update build-depends
+  * debian/patches/00_fix_crash_on_init.patch:
+    + Added. Fixed crash on intialisation because of running strcmp on NULL.
+      (From upstream svn)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 13 Mar 2008 09:58:45 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 13 Mar 2008 10:31:23 +0100
 
 cheese (0.2.4-0ubuntu2) hardy; urgency=low
 

Added: desktop/unstable/cheese/debian/patches/00_fix_crash_on_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/00_fix_crash_on_init.patch?rev=15057&op=file
==============================================================================
--- desktop/unstable/cheese/debian/patches/00_fix_crash_on_init.patch (added)
+++ desktop/unstable/cheese/debian/patches/00_fix_crash_on_init.patch Thu Mar 13 09:32:01 2008
@@ -1,0 +1,13 @@
+Index: src/cheese-webcam.c
+===================================================================
+--- src/cheese-webcam.c	(revision 587)
++++ src/cheese-webcam.c	(revision 588)
+@@ -579,7 +579,7 @@
+     selected_device = 0;
+     for (i = 1; i < priv->num_webcam_devices ; i++)
+     {
+-	if (strcmp (priv->webcam_devices[i].video_device, priv->device_name) == 0)
++	    if (g_strcmp0 (priv->webcam_devices[i].video_device, priv->device_name) == 0)
+           selected_device = i;
+     }
+     CheeseWebcamDevice *selected_webcam = &(priv->webcam_devices[selected_device]);