r15213 - in /desktop/unstable/gvfs/debian: changelog patches/90_from_svn_fix_async_cancellation.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sun Mar 16 23:57:08 2008
New Revision: 15213

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15213
Log:
* debian/patches/90_from_svn_fix_async_cancellation.patch:
  + Patch from upstream SVN (and Ubuntu) to fix async cancellation.

Added:
    desktop/unstable/gvfs/debian/patches/90_from_svn_fix_async_cancellation.patch
Modified:
    desktop/unstable/gvfs/debian/changelog

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=15213&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog (original)
+++ desktop/unstable/gvfs/debian/changelog Sun Mar 16 23:57:08 2008
@@ -1,10 +1,15 @@
-gvfs (0.2.0.1-2) UNRELEASED; urgency=low
+gvfs (0.2.0.1-2) unstable; urgency=low
 
+  [ Josselin Mouette ]
   * Use quilt for patch handling.
   * 01_sftp_krb5.patch: ported from GnomeVFS. Make the sftp backend work 
     when pam_krb5 is used on the server side.
 
- -- Josselin Mouette <joss at debian.org>  Tue, 11 Mar 2008 21:43:43 +0100
+  [ Sebastian Dröge ]
+  * debian/patches/90_from_svn_fix_async_cancellation.patch:
+    + Patch from upstream SVN (and Ubuntu) to fix async cancellation.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 17 Mar 2008 00:56:13 +0100
 
 gvfs (0.2.0.1-1) unstable; urgency=low
 

Added: desktop/unstable/gvfs/debian/patches/90_from_svn_fix_async_cancellation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/90_from_svn_fix_async_cancellation.patch?rev=15213&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/90_from_svn_fix_async_cancellation.patch (added)
+++ desktop/unstable/gvfs/debian/patches/90_from_svn_fix_async_cancellation.patch Sun Mar 16 23:57:08 2008
@@ -1,0 +1,11 @@
+--- trunk/client/gdaemonfile.c	2008/03/11 17:35:47	1645
++++ trunk/client/gdaemonfile.c	2008/03/12 12:21:15	1646
+@@ -639,7 +639,7 @@
+ 
+   data->file = g_object_ref (file);
+   data->op = g_strdup (op);
+-  if (data->cancellable)
++  if (cancellable)
+     data->cancellable = g_object_ref (cancellable);
+   data->callback = callback;
+   data->callback_data = callback_data;