gvfs r1834 - in trunk: . monitor/proxy

[davidz svn gnome org]

Author: davidz
Date: Wed Jul 23 19:58:10 2008
New Revision: 1834
URL: http://svn.gnome.org/viewvc/gvfs?rev=1834&view=rev

Log:
2008-07-23  David Zeuthen  <davidz redhat com>

	* monitor/proxy/gproxyvolumemonitor.c
	(g_proxy_volume_monitor_finalize): Fix crasher (#544399)



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 Jul 23 19:58:10 2008
@@ -98,7 +98,11 @@
   char *match_rule;
   GObjectClass *parent_class;
 
-  parent_class = G_OBJECT_CLASS (G_OBJECT_GET_CLASS (object));
+  /* 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);
 
@@ -108,6 +112,7 @@
 
   dbus_connection_remove_filter (monitor->session_bus, filter_function, monitor);
   match_rule = get_match_rule (monitor);
+  dbus_error_init (&dbus_error);
   dbus_bus_remove_match (monitor->session_bus,
                          match_rule,
                          &dbus_error);