Don't unref the real mount directly when we're unshadowed, because that

2009-03-17  Alexander Larsson  <alexl@redhat.com>

        * monitor/proxy/gproxyshadowmount.c:
        (g_proxy_shadow_mount_remove):
	Don't unref the real mount directly when we're unshadowed, because
	that means most functions in the shadow mount won't work in the
	removed signal emissions.
	This caused lots of spew in e.g. gvfs-mount -oi on unmount of
	a shadowed mount.


svn path=/trunk/; revision=2339

2 files changed, 20 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f2990ca0..8728e259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-03-17  Alexander Larsson  <alexl@redhat.com>
 
+        * monitor/proxy/gproxyshadowmount.c:
+        (g_proxy_shadow_mount_remove):
+	Don't unref the real mount directly when we're unshadowed, because
+	that means most functions in the shadow mount won't work in the
+	removed signal emissions.
+	This caused lots of spew in e.g. gvfs-mount -oi on unmount of
+	a shadowed mount.
+
+2009-03-17  Alexander Larsson  <alexl@redhat.com>
+
         Bug 575552 – icons for audio cds duplicated on the desktop after remounts
 
         * monitor/proxy/gproxyvolumemonitor.c:
diff --git a/monitor/proxy/gproxyshadowmount.c b/monitor/proxy/gproxyshadowmount.c
index bcf5f221..dcd27a1d 100644
--- a/monitor/proxy/gproxyshadowmount.c
+++ b/monitor/proxy/gproxyshadowmount.c
@@ -49,6 +49,7 @@ struct _GProxyShadowMount {
 
   GProxyVolume *volume;
   GMount *real_mount;
+  gboolean real_mount_shadowed;
   GFile *root;
 };
 
@@ -73,6 +74,12 @@ g_proxy_shadow_mount_finalize (GObject *object)
 
   g_proxy_shadow_mount_remove (mount);
 
+  if (mount->real_mount != NULL)
+    {
+      g_object_unref (mount->real_mount);
+      mount->real_mount = NULL;
+    }
+  
   if (mount->volume_monitor != NULL)
     g_object_unref (mount->volume_monitor);
 
@@ -107,13 +114,12 @@ g_proxy_shadow_mount_init (GProxyShadowMount *proxy_shadow_mount)
 void
 g_proxy_shadow_mount_remove (GProxyShadowMount *mount)
 {
-  if (mount->real_mount != NULL)
+  if (mount->real_mount_shadowed)
     {
       g_mount_unshadow (mount->real_mount);
       signal_emit_in_idle (mount->real_mount, "changed", NULL);
       signal_emit_in_idle (mount->volume_monitor, "mount-changed", mount->real_mount);
-      g_object_unref (mount->real_mount);
-      mount->real_mount = NULL;
+      mount->real_mount_shadowed = FALSE;
     }
 }
 
@@ -138,6 +144,7 @@ g_proxy_shadow_mount_new (GProxyVolumeMonitor *volume_monitor,
   mount->volume_monitor = g_object_ref (volume_monitor);
   mount->volume = g_object_ref (volume);
   mount->real_mount = g_object_ref (real_mount);
+  mount->real_mount_shadowed = TRUE;
   mount->root = activation_root;
 
   g_mount_shadow (mount->real_mount);