gvfs r2285 - in trunk: . monitor/proxy

[alexl svn gnome org]

Author: alexl
Date: Wed Mar  4 11:20:27 2009
New Revision: 2285
URL: http://svn.gnome.org/viewvc/gvfs?rev=2285&view=rev

Log:
2009-03-04  Alexander Larsson  <alexl redhat com>

	* monitor/proxy/gproxyvolumemonitor.c:
	Break circular dependencies on dispose.




Modified:
   trunk/ChangeLog
   trunk/monitor/proxy/gproxyvolumemonitor.c

Modified: trunk/monitor/proxy/gproxyvolumemonitor.c
==============================================================================
--- trunk/monitor/proxy/gproxyvolumemonitor.c	(original)
+++ trunk/monitor/proxy/gproxyvolumemonitor.c	Wed Mar  4 11:20:27 2009
@@ -167,6 +167,33 @@
     parent_class->finalize (object);
 }
 
+static void
+g_proxy_volume_monitor_dispose (GObject *object)
+{
+  GProxyVolumeMonitor *monitor;
+  GObjectClass *parent_class;
+
+  /* since GProxyVolumeMonitor is a non-instantiatable type we're dealing with a
+   * sub-type here. So we need to look at the grandparent sub-type to get the
+   * parent class for GProxyVolumeMonitor */
+  parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (
+                                 g_type_class_peek_parent (G_OBJECT_GET_CLASS (object))));
+
+  monitor = G_PROXY_VOLUME_MONITOR (object);
+
+  /* Clear all objects to avoid circular dependencies keeping things alive.
+   * Note that atm we're keeping the union monitor alive, so this won't
+   * actually happen, but better safe than sorry in case we change this
+   * later */
+  g_hash_table_remove_all (monitor->drives);
+  g_hash_table_remove_all (monitor->volumes);
+  g_hash_table_remove_all (monitor->mounts);
+  
+ if (parent_class->dispose)
+    parent_class->dispose (object);
+}
+
+
 static GList *
 get_mounts (GVolumeMonitor *volume_monitor)
 {
@@ -920,6 +947,7 @@
 
   gobject_class->constructor = g_proxy_volume_monitor_constructor;
   gobject_class->finalize = g_proxy_volume_monitor_finalize;
+  gobject_class->dispose = g_proxy_volume_monitor_dispose;
 
   monitor_class->get_mounts = get_mounts;
   monitor_class->get_volumes = get_volumes;