r36108 - in /desktop/experimental/gvfs/debian: changelog patches/handle-inactive-vfs.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Oct 23 08:43:38 2012
New Revision: 36108

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36108
Log:
add patch from Ubuntu to not crash when creating volume monitors if the
VFS never initialized (LP: #832533)

Added:
    desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.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=36108&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Oct 23 08:43:38 2012
@@ -14,6 +14,8 @@
     - 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)
+    - add patch from Ubuntu to not crash when creating volume monitors if the
+      VFS never initialized (LP: #832533)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 23 Oct 2012 09:21:04 +0100
 

Added: desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch?rev=36108&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch (added)
+++ desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch [utf-8] Tue Oct 23 08:43:38 2012
@@ -1,0 +1,17 @@
+Description: If the VFS never initialized, don't crash when creating volume monitors
+Origin: vendor, Ubuntu
+Bug-Ubuntu: LP #832533
+
+Index: gvfs/client/gdaemonvfs.c
+===================================================================
+--- gvfs.orig/client/gdaemonvfs.c	2012-09-20 12:44:55.450666000 +0200
++++ gvfs/client/gdaemonvfs.c	2012-09-20 12:49:43.447854749 +0200
+@@ -1479,7 +1479,7 @@
+ GDBusConnection *
+ _g_daemon_vfs_get_async_bus (void)
+ {
+-  return the_vfs->async_bus;
++  return the_vfs ? the_vfs->async_bus : NULL;
+ }
+ 
+ static gboolean

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