[gnome-builder] libide-vcs: port monitor away from libdazzle

[Christian Hergert <chergert src gnome org>]

commit 9fb33a439f603c8f62395f555b7574df31a63b2c
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 11 18:06:49 2022 -0700

    libide-vcs: port monitor away from libdazzle

 src/libide/vcs/ide-vcs-monitor.c | 66 +++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 41 deletions(-)
---
diff --git a/src/libide/vcs/ide-vcs-monitor.c b/src/libide/vcs/ide-vcs-monitor.c
index 10f974189..86627f409 100644
--- a/src/libide/vcs/ide-vcs-monitor.c
+++ b/src/libide/vcs/ide-vcs-monitor.c
@@ -22,8 +22,8 @@
 
 #include "config.h"
 
-#include <dazzle.h>
 #include <libide-core.h>
+#include <libide-io.h>
 
 #include "ide-vcs.h"
 #include "ide-vcs-file-info.h"
@@ -35,9 +35,9 @@ struct _IdeVcsMonitor
 
   GFile                   *root;
   IdeVcs                  *vcs;
-  DzlSignalGroup          *vcs_signals;
-  DzlRecursiveFileMonitor *monitor;
-  DzlSignalGroup          *monitor_signals;
+  IdeSignalGroup          *vcs_signals;
+  IdeRecursiveFileMonitor *monitor;
+  IdeSignalGroup          *monitor_signals;
   GHashTable              *status_by_file;
 
   guint                    cache_source;
@@ -221,7 +221,7 @@ ide_vcs_monitor_changed_cb (IdeVcsMonitor           *self,
                             GFile                   *file,
                             GFile                   *other_file,
                             GFileMonitorEvent        event,
-                            DzlRecursiveFileMonitor *monitor)
+                            IdeRecursiveFileMonitor *monitor)
 {
   IDE_ENTRY;
 
@@ -229,7 +229,7 @@ ide_vcs_monitor_changed_cb (IdeVcsMonitor           *self,
   g_assert (IDE_IS_VCS_MONITOR (self));
   g_assert (G_IS_FILE (file));
   g_assert (!other_file || G_IS_FILE (other_file));
-  g_assert (DZL_IS_RECURSIVE_FILE_MONITOR (monitor));
+  g_assert (IDE_IS_RECURSIVE_FILE_MONITOR (monitor));
 
   self->last_change_seq++;
 
@@ -280,16 +280,16 @@ ide_vcs_monitor_start_cb (GObject      *object,
                           GAsyncResult *result,
                           gpointer      user_data)
 {
-  DzlRecursiveFileMonitor *monitor = (DzlRecursiveFileMonitor *)object;
+  IdeRecursiveFileMonitor *monitor = (IdeRecursiveFileMonitor *)object;
   g_autoptr(IdeVcsMonitor) self = user_data;
   g_autoptr(GError) error = NULL;
 
   g_assert (IDE_IS_MAIN_THREAD ());
-  g_assert (DZL_IS_RECURSIVE_FILE_MONITOR (monitor));
+  g_assert (IDE_IS_RECURSIVE_FILE_MONITOR (monitor));
   g_assert (G_IS_ASYNC_RESULT (result));
   g_assert (IDE_IS_VCS_MONITOR (self));
 
-  if (!dzl_recursive_file_monitor_start_finish (monitor, result, &error))
+  if (!ide_recursive_file_monitor_start_finish (monitor, result, &error))
     g_warning ("%s", error->message);
 
   ide_vcs_monitor_queue_reload (self);
@@ -307,20 +307,20 @@ ide_vcs_monitor_maybe_reload_locked (IdeVcsMonitor *self)
 
   if (self->monitor)
     {
-      dzl_signal_group_set_target (self->monitor_signals, NULL);
-      dzl_recursive_file_monitor_set_ignore_func (self->monitor, NULL, NULL, NULL);
-      dzl_recursive_file_monitor_cancel (self->monitor);
+      ide_signal_group_set_target (self->monitor_signals, NULL);
+      ide_recursive_file_monitor_set_ignore_func (self->monitor, NULL, NULL, NULL);
+      ide_recursive_file_monitor_cancel (self->monitor);
       g_clear_object (&self->monitor);
     }
 
   if (G_IS_FILE (self->root) && IDE_IS_VCS (self->vcs))
     {
-      self->monitor = dzl_recursive_file_monitor_new (self->root);
-      dzl_recursive_file_monitor_set_ignore_func (self->monitor,
+      self->monitor = ide_recursive_file_monitor_new (self->root);
+      ide_recursive_file_monitor_set_ignore_func (self->monitor,
                                                   ide_vcs_monitor_ignore_func,
                                                   self, NULL);
-      dzl_signal_group_set_target (self->monitor_signals, self->monitor);
-      dzl_recursive_file_monitor_start_async (self->monitor,
+      ide_signal_group_set_target (self->monitor_signals, self->monitor);
+      ide_recursive_file_monitor_start_async (self->monitor,
                                               NULL,
                                               ide_vcs_monitor_start_cb,
                                               g_object_ref (self));
@@ -339,13 +339,13 @@ ide_vcs_monitor_destroy (IdeObject *object)
 
   if (self->monitor != NULL)
     {
-      dzl_recursive_file_monitor_set_ignore_func (self->monitor, NULL, NULL, NULL);
-      dzl_recursive_file_monitor_cancel (self->monitor);
+      ide_recursive_file_monitor_set_ignore_func (self->monitor, NULL, NULL, NULL);
+      ide_recursive_file_monitor_cancel (self->monitor);
       g_clear_object (&self->monitor);
     }
 
-  dzl_signal_group_set_target (self->monitor_signals, NULL);
-  dzl_signal_group_set_target (self->vcs_signals, NULL);
+  ide_signal_group_set_target (self->monitor_signals, NULL);
+  ide_signal_group_set_target (self->vcs_signals, NULL);
 
   g_clear_object (&self->vcs);
 
@@ -428,8 +428,6 @@ ide_vcs_monitor_class_init (IdeVcsMonitorClass *klass)
    *
    * The "root" property is the root of the file-system to begin
    * monitoring for changes.
-   *
-   * Since: 3.32
    */
   properties [PROP_ROOT] =
     g_param_spec_object ("root",
@@ -444,8 +442,6 @@ ide_vcs_monitor_class_init (IdeVcsMonitorClass *klass)
    * The "vcs" property is the version control system to be queried for
    * additional status information when a file has been discovered to
    * have been changed.
-   *
-   * Since: 3.32
    */
   properties [PROP_VCS] =
     g_param_spec_object ("vcs",
@@ -465,8 +461,6 @@ ide_vcs_monitor_class_init (IdeVcsMonitorClass *klass)
    *
    * The "changed" signal is emitted when a file has been discovered to
    * have been changed on disk.
-   *
-   * Since: 3.32
    */
   signals [CHANGED] =
     g_signal_new ("changed",
@@ -485,8 +479,6 @@ ide_vcs_monitor_class_init (IdeVcsMonitorClass *klass)
    * @self: an #IdeVcsMonitor
    *
    * The "reloaded" signal is emitted when the monitor has been reloaded.
-   *
-   * Since: 3.32
    */
   signals [RELOADED] =
     g_signal_new ("reloaded",
@@ -500,17 +492,17 @@ ide_vcs_monitor_init (IdeVcsMonitor *self)
 {
   self->last_change_seq = 1;
 
-  self->monitor_signals = dzl_signal_group_new (DZL_TYPE_RECURSIVE_FILE_MONITOR);
+  self->monitor_signals = ide_signal_group_new (IDE_TYPE_RECURSIVE_FILE_MONITOR);
 
-  dzl_signal_group_connect_object (self->monitor_signals,
+  ide_signal_group_connect_object (self->monitor_signals,
                                    "changed",
                                    G_CALLBACK (ide_vcs_monitor_changed_cb),
                                    self,
                                    G_CONNECT_SWAPPED);
 
-  self->vcs_signals = dzl_signal_group_new (IDE_TYPE_VCS);
+  self->vcs_signals = ide_signal_group_new (IDE_TYPE_VCS);
 
-  dzl_signal_group_connect_object (self->vcs_signals,
+  ide_signal_group_connect_object (self->vcs_signals,
                                    "changed",
                                    G_CALLBACK (ide_vcs_monitor_vcs_changed_cb),
                                    self,
@@ -529,8 +521,6 @@ ide_vcs_monitor_init (IdeVcsMonitor *self)
  * the info to be there.
  *
  * Returns: (transfer full) (nullable): an #IdeVcsFileInfo or %NULL
- *
- * Since: 3.32
  */
 IdeVcsFileInfo *
 ide_vcs_monitor_ref_info (IdeVcsMonitor *self,
@@ -559,8 +549,6 @@ ide_vcs_monitor_ref_info (IdeVcsMonitor *self,
  * #IdeVcsMonitor and returns it.
  *
  * Returns: (transfer full) (nullable): an #IdeVcs or %NULL
- *
- * Since: 3.32
  */
 IdeVcs *
 ide_vcs_monitor_ref_vcs (IdeVcsMonitor *self)
@@ -584,8 +572,6 @@ ide_vcs_monitor_ref_vcs (IdeVcsMonitor *self)
  * count of the #GFile by one.
  *
  * Returns: (transfer full) (nullable): a #GFile or %NULL
- *
- * Since: 3.32
  */
 GFile *
 ide_vcs_monitor_ref_root (IdeVcsMonitor *self)
@@ -630,7 +616,7 @@ ide_vcs_monitor_set_vcs (IdeVcsMonitor *self,
   ide_object_lock (IDE_OBJECT (self));
   if (g_set_object (&self->vcs, vcs))
     {
-      dzl_signal_group_set_target (self->vcs_signals, vcs);
+      ide_signal_group_set_target (self->vcs_signals, vcs);
       ide_object_notify_by_pspec (self, properties [PROP_VCS]);
       ide_vcs_monitor_maybe_reload_locked (self);
     }
@@ -652,8 +638,6 @@ ide_vcs_monitor_get_sequence (IdeVcsMonitor *self)
  * Gets the #IdeVcsMonitor for a context.
  *
  * Returns: (nullable) (transfer none): an #IdeVcsMonitor
- *
- * Since: 3.32
  */
 IdeVcsMonitor *
 ide_vcs_monitor_from_context (IdeContext *context)