[libdazzle] recursive-monitor: share ignore disposal path



commit 9b929ef3d1a15cab4180182b70c63ab7808cf7d0
Author: Christian Hergert <chergert redhat com>
Date:   Thu Nov 30 03:36:06 2017 -0800

    recursive-monitor: share ignore disposal path
    
    We want to hit this the same way each time and synchronize with the
    mutex for the private data.

 src/files/dzl-recursive-file-monitor.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/src/files/dzl-recursive-file-monitor.c b/src/files/dzl-recursive-file-monitor.c
index 0d15a50..f82c502 100644
--- a/src/files/dzl-recursive-file-monitor.c
+++ b/src/files/dzl-recursive-file-monitor.c
@@ -306,18 +306,7 @@ dzl_recursive_file_monitor_dispose (GObject *object)
 
   dzl_clear_source (&self->start_handler);
   g_cancellable_cancel (self->cancellable);
-
-  if (self->ignore_func_data && self->ignore_func_data_destroy)
-    {
-      gpointer data = self->ignore_func_data;
-      GDestroyNotify notify = self->ignore_func_data_destroy;
-
-      self->ignore_func = NULL;
-      self->ignore_func_data = NULL;
-      self->ignore_func_data_destroy = NULL;
-
-      notify (data);
-    }
+  dzl_recursive_file_monitor_set_ignore_func (self, NULL, NULL, NULL);
 
   G_OBJECT_CLASS (dzl_recursive_file_monitor_parent_class)->dispose (object);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]