+2008-03-05 Alexander Larsson <alexl@redhat.com>
+
+ * gfilemonitor.c:
+ Make cancellation threadsafe (i.e.
+ guarantee its only done once, and always
+ done)
+
+ * glocaldirectorymonitor.c:
+ Make sure we the monitor lives while the
+ mounts_changed callback is being called (#520484)
+
2008-03-04 Wouter Bolsterlee <wbolster@svn.gnome.org>
* gbufferedinputstream.c: Fix typo in parameter
* are monitoring, connect to the #GFileMonitor::changed signal.
**/
+G_LOCK_DEFINE_STATIC(cancelled);
+
enum {
CHANGED,
LAST_SIGNAL
break;
case PROP_CANCELLED:
+ G_LOCK (cancelled);
g_value_set_boolean (value, priv->cancelled);
+ G_UNLOCK (cancelled);
break;
default:
monitor = G_FILE_MONITOR (object);
/* Make sure we cancel on last unref */
- if (!monitor->priv->cancelled)
- g_file_monitor_cancel (monitor);
+ g_file_monitor_cancel (monitor);
if (G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose)
(*G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose) (object);
g_file_monitor_is_cancelled (GFileMonitor *monitor)
{
g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE);
+ gboolean res;
- return monitor->priv->cancelled;
+ G_LOCK (cancelled);
+ res = monitor->priv->cancelled;
+ G_UNLOCK (cancelled);
+
+ return res;
}
/**
g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE);
+ G_LOCK (cancelled);
if (monitor->priv->cancelled)
- return TRUE;
+ {
+ G_UNLOCK (cancelled);
+ return TRUE;
+ }
monitor->priv->cancelled = TRUE;
+ G_UNLOCK (cancelled);
+
g_object_notify (G_OBJECT (monitor), "cancelled");
klass = G_FILE_MONITOR_GET_CLASS (monitor);
g_unix_mount_free (mount);
local_monitor->mount_monitor = g_unix_mount_monitor_new ();
- g_signal_connect (local_monitor->mount_monitor, "mounts_changed",
- G_CALLBACK (mounts_changed), local_monitor);
+ g_signal_connect_object (local_monitor->mount_monitor, "mounts_changed",
+ G_CALLBACK (mounts_changed), local_monitor, 0);
#endif
}