r36107 - in /desktop/experimental/gvfs/debian: changelog patches/dont-crash-on-null-job.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Oct 23 08:41:43 2012
New Revision: 36107

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36107
Log:
add patch from Ubuntu to not crash if a NULL job finishes (LP: #345754,
LP: #838464)

Added:
    desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/series

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=36107&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Oct 23 08:41:43 2012
@@ -12,6 +12,8 @@
       bash completion in /usr/share (LP: #1022927)
     - update lists of daemons etc. to install
     - add patch from Ubuntu to force use of GPhoto 2.4
+    - add patch from Ubuntu to not crash if a NULL job finishes (LP: #345754,
+      LP: #838464)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 23 Oct 2012 09:21:04 +0100
 

Added: desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch?rev=36107&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch (added)
+++ desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch [utf-8] Tue Oct 23 08:41:43 2012
@@ -1,0 +1,27 @@
+Description: Don't try to announce the finish of a NULL job.
+Origin: vendor, Ubuntu
+Bug-Ubuntu: LP #345754, #838464
+
+Index: gvfs-1.12.0/daemon/gvfschannel.c
+===================================================================
+--- gvfs-1.12.0.orig/daemon/gvfschannel.c	2012-04-11 16:56:44.000000000 -0400
++++ gvfs-1.12.0/daemon/gvfschannel.c	2012-04-12 13:12:35.621018364 -0400
+@@ -610,7 +610,8 @@
+ 
+   job = channel->priv->current_job;
+   channel->priv->current_job = NULL;
+-  g_vfs_job_emit_finished (job);
++  if (job)
++    g_vfs_job_emit_finished (job);
+ 
+   class = G_VFS_CHANNEL_GET_CLASS (channel);
+   
+@@ -631,7 +632,7 @@
+     }
+   /* Start queued request or readahead */
+   else if (!start_queued_request (channel) &&
+-	   class->readahead)
++	   class->readahead && job)
+     {
+       /* No queued requests, maybe we want to do a readahead call */
+       channel->priv->current_job = class->readahead (channel, job);

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=36107&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Tue Oct 23 08:41:43 2012
@@ -2,4 +2,5 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+dont-crash-on-null-job.patch
 build_old_libgphoto.patch