[libdazzle] build: use g_clear_pointer()

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [libdazzle] build: use g_clear_pointer()
Date: Mon, 30 Jul 2018 21:53:41 +0000 (UTC)
commit bb90a9fa929b60d3a7b7107fc15daf362fbc1c7d
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 30 14:31:22 2018 -0700

    build: use g_clear_pointer()
    
    We don't need to use dzl_clear_pointer() anymore now that GLib has access
    to g_clear_pointer() that performs similar checks as dzl_clear_pointer().

 src/actions/dzl-action-group.h                  |  6 +++---
 src/actions/dzl-properties-group.c              | 12 ++++++------
 src/actions/dzl-settings-flag-action.c          |  6 +++---
 src/actions/dzl-widget-action-group.c           |  2 +-
 src/animation/dzl-box-theatric.c                |  6 +++---
 src/app/dzl-application-window.c                |  8 ++++----
 src/app/dzl-application.c                       |  6 +++---
 src/bindings/dzl-binding-group.c                |  6 +++---
 src/bindings/dzl-signal-group.c                 |  4 ++--
 src/cache/dzl-task-cache.c                      | 18 +++++++++---------
 src/files/dzl-directory-model.c                 |  2 +-
 src/files/dzl-directory-reaper.c                |  4 ++--
 src/files/dzl-file-transfer.c                   |  2 +-
 src/files/dzl-recursive-file-monitor.c          |  4 ++--
 src/graphing/dzl-cpu-model.c                    |  4 ++--
 src/graphing/dzl-graph-column.c                 |  6 +++---
 src/graphing/dzl-graph-model.c                  |  2 +-
 src/graphing/dzl-graph-view.c                   |  6 +++---
 src/menus/dzl-joined-menu.c                     |  2 +-
 src/menus/dzl-menu-manager.c                    |  2 +-
 src/panel/dzl-dock-manager.c                    |  4 ++--
 src/panel/dzl-dock-transient-grab.c             |  4 ++--
 src/panel/dzl-dock-widget.c                     |  4 ++--
 src/panel/dzl-tab-strip.c                       |  2 +-
 src/panel/dzl-tab.c                             |  8 ++++----
 src/pathbar/dzl-path-element.c                  |  6 +++---
 src/prefs/dzl-preferences-bin.c                 | 18 +++++++++---------
 src/prefs/dzl-preferences-file-chooser-button.c |  2 +-
 src/prefs/dzl-preferences-font-button.c         |  4 ++--
 src/prefs/dzl-preferences-group.c               |  2 +-
 src/prefs/dzl-preferences-page.c                |  2 +-
 src/prefs/dzl-preferences-spin-button.c         | 20 ++++++++++----------
 src/prefs/dzl-preferences-switch.c              |  4 ++--
 src/prefs/dzl-preferences-view.c                |  6 +++---
 src/search/dzl-fuzzy-index-builder.c            | 14 +++++++-------
 src/search/dzl-fuzzy-index-cursor.c             |  6 +++---
 src/search/dzl-fuzzy-index-match.c              |  4 ++--
 src/search/dzl-fuzzy-index.c                    | 14 +++++++-------
 src/search/dzl-fuzzy-mutable-index.c            |  6 +++---
 src/search/dzl-pattern-spec.c                   |  4 ++--
 src/settings/dzl-settings-sandwich.c            |  6 +++---
 src/shortcuts/dzl-shortcut-accel-dialog.c       |  4 ++--
 src/shortcuts/dzl-shortcut-chord.c              |  4 ++--
 src/shortcuts/dzl-shortcut-closure-chain.c      |  6 +++---
 src/shortcuts/dzl-shortcut-context.c            |  2 +-
 src/shortcuts/dzl-shortcut-controller.c         |  8 ++++----
 src/shortcuts/dzl-shortcut-label.c              |  2 +-
 src/shortcuts/dzl-shortcut-manager.c            |  6 +++---
 src/shortcuts/dzl-shortcut-theme-editor.c       |  6 +++---
 src/shortcuts/dzl-shortcut-theme-load.c         |  4 ++--
 src/shortcuts/dzl-shortcut-theme.c              | 16 ++++++++--------
 src/shortcuts/dzl-shortcuts-section.c           |  6 +++---
 src/shortcuts/dzl-shortcuts-window.c            | 10 +++++-----
 src/statemachine/dzl-state-machine.c            |  4 ++--
 src/suggestions/dzl-suggestion-entry-buffer.c   | 10 +++++-----
 src/suggestions/dzl-suggestion.c                |  6 +++---
 src/theming/dzl-css-provider.c                  |  2 +-
 src/theming/dzl-theme-manager.c                 |  2 +-
 src/tree/dzl-tree-node.c                        |  4 ++--
 src/tree/dzl-tree-store.c                       |  2 +-
 src/tree/dzl-tree.c                             | 14 +++++++-------
 src/util/dzl-counter.c                          |  2 +-
 src/widgets/dzl-column-layout.c                 |  2 +-
 src/widgets/dzl-counters-window.c               |  4 ++--
 src/widgets/dzl-file-chooser-entry.c            |  2 +-
 src/widgets/dzl-list-box.c                      |  4 ++--
 src/widgets/dzl-multi-paned.c                   |  2 +-
 src/widgets/dzl-priority-box.c                  |  2 +-
 src/widgets/dzl-radio-box.c                     |  6 +++---
 src/widgets/dzl-simple-label.c                  |  2 +-
 src/widgets/dzl-slider.c                        |  2 +-
 src/widgets/dzl-stack-list.c                    |  2 +-
 src/widgets/dzl-three-grid.c                    |  6 +++---
 73 files changed, 201 insertions(+), 201 deletions(-)
---
diff --git a/src/actions/dzl-action-group.h b/src/actions/dzl-action-group.h
index fa7b506..7d94067 100644
--- a/src/actions/dzl-action-group.h
+++ b/src/actions/dzl-action-group.h
@@ -66,8 +66,8 @@ static void
 _##prefix##_action_info_free (gpointer data)                                      \
 {                                                                                 \
   Type##ActionInfo *info = data;                                                  \
-  dzl_clear_pointer (&info->state, g_variant_unref);                                \
-  dzl_clear_pointer (&info->state_hint, g_variant_unref);                           \
+  g_clear_pointer (&info->state, g_variant_unref);                                \
+  g_clear_pointer (&info->state_hint, g_variant_unref);                           \
   g_slice_free (Type##ActionInfo, info);                                          \
 }                                                                                 \
                                                                                   \
@@ -106,7 +106,7 @@ prefix##_set_action_state (Type *self,
                                                         name);                    \
   if (state != info->state)                                                       \
     {                                                                             \
-      dzl_clear_pointer (&info->state, g_variant_unref);                            \
+      g_clear_pointer (&info->state, g_variant_unref);                            \
       info->state = state ? g_variant_ref_sink (state) : NULL;                    \
       g_action_group_action_state_changed (G_ACTION_GROUP (self), name, state);   \
     }                                                                             \
diff --git a/src/actions/dzl-properties-group.c b/src/actions/dzl-properties-group.c
index a3f0495..393aa19 100644
--- a/src/actions/dzl-properties-group.c
+++ b/src/actions/dzl-properties-group.c
@@ -150,7 +150,7 @@ get_action_state (GObject       *object,
           if (eval != NULL)
             ret = g_variant_new_string (eval->value_nick);
 
-          dzl_clear_pointer (&eclass, g_type_class_unref);
+          g_clear_pointer (&eclass, g_type_class_unref);
 
           break;
         }
@@ -413,12 +413,12 @@ dzl_properties_group_change_action_state (GActionGroup *group,
                         {
                           g_value_init (&value, mapping->property_type);
                           g_value_set_enum (&value, eval->value);
-                          dzl_clear_pointer (&eclass, g_type_class_unref);
+                          g_clear_pointer (&eclass, g_type_class_unref);
                           break;
                         }
                     }
 
-                  dzl_clear_pointer (&eclass, g_type_class_unref);
+                  g_clear_pointer (&eclass, g_type_class_unref);
                   g_warning ("Failed to transform '%s' to %s",
                              str, g_type_name (mapping->property_type));
                   return;
@@ -682,7 +682,7 @@ dzl_properties_group_finalize (GObject *object)
 
   g_weak_ref_clear (&self->object_ref);
 
-  dzl_clear_pointer (&self->mappings, g_array_unref);
+  g_clear_pointer (&self->mappings, g_array_unref);
 
   G_OBJECT_CLASS (dzl_properties_group_parent_class)->finalize (object);
 }
@@ -867,7 +867,7 @@ dzl_properties_group_add_property_full (DzlPropertiesGroup *self,
   g_action_group_action_added (G_ACTION_GROUP (self), mapping.action_name);
 
 failure:
-  dzl_clear_pointer (&object_class, g_type_class_unref);
+  g_clear_pointer (&object_class, g_type_class_unref);
 }
 
 /**
@@ -980,7 +980,7 @@ dzl_properties_group_add_all_properties (DzlPropertiesGroup *self)
     }
 
 failure:
-  dzl_clear_pointer (&object_class, g_type_class_unref);
+  g_clear_pointer (&object_class, g_type_class_unref);
 }
 
 /**
diff --git a/src/actions/dzl-settings-flag-action.c b/src/actions/dzl-settings-flag-action.c
index 5e0cf70..a7347ac 100644
--- a/src/actions/dzl-settings-flag-action.c
+++ b/src/actions/dzl-settings-flag-action.c
@@ -81,9 +81,9 @@ dzl_settings_flag_action_finalize (GObject *object)
 {
   DzlSettingsFlagAction *self = (DzlSettingsFlagAction *)object;
 
-  dzl_clear_pointer (&self->schema_id, g_free);
-  dzl_clear_pointer (&self->schema_key, g_free);
-  dzl_clear_pointer (&self->flag_nick, g_free);
+  g_clear_pointer (&self->schema_id, g_free);
+  g_clear_pointer (&self->schema_key, g_free);
+  g_clear_pointer (&self->flag_nick, g_free);
 
   G_OBJECT_CLASS (dzl_settings_flag_action_parent_class)->finalize (object);
 }
diff --git a/src/actions/dzl-widget-action-group.c b/src/actions/dzl-widget-action-group.c
index 3229d8a..a9c9dab 100644
--- a/src/actions/dzl-widget-action-group.c
+++ b/src/actions/dzl-widget-action-group.c
@@ -342,7 +342,7 @@ dzl_widget_action_group_finalize (GObject *object)
 {
   DzlWidgetActionGroup *self = (DzlWidgetActionGroup *)object;
 
-  dzl_clear_pointer (&self->enabled, g_hash_table_unref);
+  g_clear_pointer (&self->enabled, g_hash_table_unref);
 
   G_OBJECT_CLASS (dzl_widget_action_group_parent_class)->finalize (object);
 }
diff --git a/src/animation/dzl-box-theatric.c b/src/animation/dzl-box-theatric.c
index e83492f..a161e28 100644
--- a/src/animation/dzl-box-theatric.c
+++ b/src/animation/dzl-box-theatric.c
@@ -216,7 +216,7 @@ dzl_box_theatric_dispose (GObject *object)
       self->target = NULL;
     }
 
-  dzl_clear_pointer (&self->icon_surface, cairo_surface_destroy);
+  g_clear_pointer (&self->icon_surface, cairo_surface_destroy);
   g_clear_object (&self->icon);
 
   G_OBJECT_CLASS (dzl_box_theatric_parent_class)->dispose (object);
@@ -307,14 +307,14 @@ dzl_box_theatric_set_property (GObject      *object,
       break;
 
     case PROP_ICON:
-      dzl_clear_pointer (&theatric->icon_surface, cairo_surface_destroy);
+      g_clear_pointer (&theatric->icon_surface, cairo_surface_destroy);
       g_clear_object (&theatric->icon);
       theatric->icon = g_value_dup_object (value);
       theatric->pixbuf_failed = FALSE;
       break;
 
     case PROP_SURFACE:
-      dzl_clear_pointer (&theatric->icon_surface, cairo_surface_destroy);
+      g_clear_pointer (&theatric->icon_surface, cairo_surface_destroy);
       theatric->icon_surface = g_value_get_pointer (value);
       if (theatric->icon_surface != NULL)
         cairo_surface_reference (theatric->icon_surface);
diff --git a/src/app/dzl-application-window.c b/src/app/dzl-application-window.c
index 24e0d02..5fe14a8 100644
--- a/src/app/dzl-application-window.c
+++ b/src/app/dzl-application-window.c
@@ -381,10 +381,10 @@ dzl_application_window_destroy (GtkWidget *widget)
       priv->motion_notify_handler = 0;
     }
 
-  dzl_clear_pointer ((GtkWidget **)&priv->titlebar_container, gtk_widget_destroy);
-  dzl_clear_pointer ((GtkWidget **)&priv->titlebar_revealer, gtk_widget_destroy);
-  dzl_clear_pointer ((GtkWidget **)&priv->event_box, gtk_widget_destroy);
-  dzl_clear_pointer ((GtkWidget **)&priv->overlay, gtk_widget_destroy);
+  g_clear_pointer ((GtkWidget **)&priv->titlebar_container, gtk_widget_destroy);
+  g_clear_pointer ((GtkWidget **)&priv->titlebar_revealer, gtk_widget_destroy);
+  g_clear_pointer ((GtkWidget **)&priv->event_box, gtk_widget_destroy);
+  g_clear_pointer ((GtkWidget **)&priv->overlay, gtk_widget_destroy);
 
   dzl_clear_source (&priv->fullscreen_source);
   dzl_clear_source (&priv->fullscreen_reveal_source);
diff --git a/src/app/dzl-application.c b/src/app/dzl-application.c
index 3ab9290..7c6efc1 100644
--- a/src/app/dzl-application.c
+++ b/src/app/dzl-application.c
@@ -215,7 +215,7 @@ dzl_application_startup (GApplication *app)
       const gchar *path = g_ptr_array_index (priv->deferred_resources, i);
       DZL_APPLICATION_GET_CLASS (self)->add_resources (self, path);
     }
-  dzl_clear_pointer (&priv->deferred_resources, g_ptr_array_unref);
+  g_clear_pointer (&priv->deferred_resources, g_ptr_array_unref);
 
   /*
    * Now force reload the keyboard shortcuts without defering to the main
@@ -230,8 +230,8 @@ dzl_application_finalize (GObject *object)
   DzlApplication *self = (DzlApplication *)object;
   DzlApplicationPrivate *priv = dzl_application_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->deferred_resources, g_ptr_array_unref);
-  dzl_clear_pointer (&priv->menu_merge_ids, g_hash_table_unref);
+  g_clear_pointer (&priv->deferred_resources, g_ptr_array_unref);
+  g_clear_pointer (&priv->menu_merge_ids, g_hash_table_unref);
   g_clear_object (&priv->theme_manager);
   g_clear_object (&priv->menu_manager);
   g_clear_object (&priv->shortcut_manager);
diff --git a/src/bindings/dzl-binding-group.c b/src/bindings/dzl-binding-group.c
index 3b917f7..82b9d75 100644
--- a/src/bindings/dzl-binding-group.c
+++ b/src/bindings/dzl-binding-group.c
@@ -249,8 +249,8 @@ lazy_binding_free (gpointer data)
 
   if (lazy_binding->using_closures)
     {
-      dzl_clear_pointer (&lazy_binding->transform_to, g_closure_unref);
-      dzl_clear_pointer (&lazy_binding->transform_from, g_closure_unref);
+      g_clear_pointer (&lazy_binding->transform_to, g_closure_unref);
+      g_clear_pointer (&lazy_binding->transform_from, g_closure_unref);
     }
 
   g_slice_free (LazyBinding, lazy_binding);
@@ -285,7 +285,7 @@ dzl_binding_group_finalize (GObject *object)
   g_assert (self->lazy_bindings != NULL);
   g_assert (self->lazy_bindings->len == 0);
 
-  dzl_clear_pointer (&self->lazy_bindings, g_ptr_array_unref);
+  g_clear_pointer (&self->lazy_bindings, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_binding_group_parent_class)->finalize (object);
 }
diff --git a/src/bindings/dzl-signal-group.c b/src/bindings/dzl-signal-group.c
index 1ed50de..8331f47 100644
--- a/src/bindings/dzl-signal-group.c
+++ b/src/bindings/dzl-signal-group.c
@@ -460,7 +460,7 @@ signal_handler_free (gpointer data)
   handler->handler_id = 0;
   handler->signal_id = 0;
   handler->signal_detail = 0;
-  dzl_clear_pointer (&handler->closure, g_closure_unref);
+  g_clear_pointer (&handler->closure, g_closure_unref);
   g_slice_free (SignalHandler, handler);
 }
 
@@ -486,7 +486,7 @@ dzl_signal_group_dispose (GObject *object)
   if (self->has_bound_at_least_once)
     dzl_signal_group_unbind (self);
 
-  dzl_clear_pointer (&self->handlers, g_ptr_array_unref);
+  g_clear_pointer (&self->handlers, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_signal_group_parent_class)->dispose (object);
 }
diff --git a/src/cache/dzl-task-cache.c b/src/cache/dzl-task-cache.c
index 79e2529..be4300a 100644
--- a/src/cache/dzl-task-cache.c
+++ b/src/cache/dzl-task-cache.c
@@ -157,7 +157,7 @@ evict_source_finalize (GSource *source)
 {
   EvictSource *ev = (EvictSource *)source;
 
-  dzl_clear_pointer (&ev->heap, dzl_heap_unref);
+  g_clear_pointer (&ev->heap, dzl_heap_unref);
 }
 
 static GSourceFuncs evict_source_funcs = {
@@ -172,8 +172,8 @@ cache_item_free (gpointer data)
 {
   CacheItem *item = data;
 
-  dzl_clear_pointer (&item->key, item->self->key_destroy_func);
-  dzl_clear_pointer (&item->value, item->self->value_destroy_func);
+  g_clear_pointer (&item->key, item->self->key_destroy_func);
+  g_clear_pointer (&item->value, item->self->value_destroy_func);
   item->self = NULL;
   item->evict_at = 0;
 
@@ -228,7 +228,7 @@ cancelled_data_free (gpointer data)
 {
   CancelledData *cancelled = data;
 
-  dzl_clear_pointer (&cancelled->key, cancelled->self->key_destroy_func);
+  g_clear_pointer (&cancelled->key, cancelled->self->key_destroy_func);
 
   g_cancellable_disconnect (cancelled->cancellable, cancelled->cancelled_id);
   cancelled->cancelled_id = 0;
@@ -776,24 +776,24 @@ dzl_task_cache_dispose (GObject *object)
       self->evict_source = NULL;
     }
 
-  dzl_clear_pointer (&self->evict_heap, dzl_heap_unref);
+  g_clear_pointer (&self->evict_heap, dzl_heap_unref);
 
   if (self->cache != NULL)
     {
       gint64 count;
 
       count = g_hash_table_size (self->cache);
-      dzl_clear_pointer (&self->cache, g_hash_table_unref);
+      g_clear_pointer (&self->cache, g_hash_table_unref);
 
       g_debug ("Evicted cache of %"G_GINT64_FORMAT" items from %s",
                count, self->name ?: "unnamed cache");
     }
 
   if (self->queued != NULL)
-    dzl_clear_pointer (&self->queued, g_hash_table_unref);
+    g_clear_pointer (&self->queued, g_hash_table_unref);
 
   if (self->in_flight != NULL)
-    dzl_clear_pointer (&self->in_flight, g_hash_table_unref);
+    g_clear_pointer (&self->in_flight, g_hash_table_unref);
 
   if (self->populate_callback_data)
     {
@@ -809,7 +809,7 @@ dzl_task_cache_finalize (GObject *object)
 {
   DzlTaskCache *self = (DzlTaskCache *)object;
 
-  dzl_clear_pointer (&self->name, g_free);
+  g_clear_pointer (&self->name, g_free);
 
   G_OBJECT_CLASS (dzl_task_cache_parent_class)->finalize (object);
 }
diff --git a/src/files/dzl-directory-model.c b/src/files/dzl-directory-model.c
index 5e38fed..e75b522 100644
--- a/src/files/dzl-directory-model.c
+++ b/src/files/dzl-directory-model.c
@@ -317,7 +317,7 @@ dzl_directory_model_finalize (GObject *object)
 
   g_clear_object (&self->cancellable);
   g_clear_object (&self->directory);
-  dzl_clear_pointer (&self->items, g_sequence_free);
+  g_clear_pointer (&self->items, g_sequence_free);
 
   if (self->visible_func_destroy)
     self->visible_func_destroy (self->visible_func_data);
diff --git a/src/files/dzl-directory-reaper.c b/src/files/dzl-directory-reaper.c
index bf44f15..08d3672 100644
--- a/src/files/dzl-directory-reaper.c
+++ b/src/files/dzl-directory-reaper.c
@@ -61,7 +61,7 @@ clear_pattern (gpointer data)
     {
     case PATTERN_GLOB:
       g_clear_object (&p->glob.directory);
-      dzl_clear_pointer (&p->glob.glob, g_free);
+      g_clear_pointer (&p->glob.glob, g_free);
       break;
 
     case PATTERN_FILE:
@@ -78,7 +78,7 @@ dzl_directory_reaper_finalize (GObject *object)
 {
   DzlDirectoryReaper *self = (DzlDirectoryReaper *)object;
 
-  dzl_clear_pointer (&self->patterns, g_array_unref);
+  g_clear_pointer (&self->patterns, g_array_unref);
 
   G_OBJECT_CLASS (dzl_directory_reaper_parent_class)->finalize (object);
 }
diff --git a/src/files/dzl-file-transfer.c b/src/files/dzl-file-transfer.c
index 40bdc19..d2a8ef5 100644
--- a/src/files/dzl-file-transfer.c
+++ b/src/files/dzl-file-transfer.c
@@ -96,7 +96,7 @@ dzl_file_transfer_finalize (GObject *object)
   DzlFileTransfer *self = (DzlFileTransfer *)object;
   DzlFileTransferPrivate *priv = dzl_file_transfer_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->opers, g_ptr_array_unref);
+  g_clear_pointer (&priv->opers, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_file_transfer_parent_class)->finalize (object);
 }
diff --git a/src/files/dzl-recursive-file-monitor.c b/src/files/dzl-recursive-file-monitor.c
index 2a2df73..092699d 100644
--- a/src/files/dzl-recursive-file-monitor.c
+++ b/src/files/dzl-recursive-file-monitor.c
@@ -476,8 +476,8 @@ dzl_recursive_file_monitor_finalize (GObject *object)
   g_clear_object (&self->root);
   g_clear_object (&self->cancellable);
 
-  dzl_clear_pointer (&self->files_by_monitor, g_hash_table_unref);
-  dzl_clear_pointer (&self->monitors_by_file, g_hash_table_unref);
+  g_clear_pointer (&self->files_by_monitor, g_hash_table_unref);
+  g_clear_pointer (&self->monitors_by_file, g_hash_table_unref);
 
   G_OBJECT_CLASS (dzl_recursive_file_monitor_parent_class)->finalize (object);
 }
diff --git a/src/graphing/dzl-cpu-model.c b/src/graphing/dzl-cpu-model.c
index e1dff4c..e3af205 100644
--- a/src/graphing/dzl-cpu-model.c
+++ b/src/graphing/dzl-cpu-model.c
@@ -330,13 +330,13 @@ dzl_cpu_model_finalize (GObject *object)
   DzlCpuModel *self = (DzlCpuModel *)object;
 
 #ifdef __linux__
-  dzl_clear_pointer (&self->stat_buf, g_free);
+  g_clear_pointer (&self->stat_buf, g_free);
   if (self->stat_fd != -1)
     close (self->stat_fd);
 #endif
 
   dzl_clear_source (&self->poll_source);
-  dzl_clear_pointer (&self->cpu_info, g_array_unref);
+  g_clear_pointer (&self->cpu_info, g_array_unref);
 
   G_OBJECT_CLASS (dzl_cpu_model_parent_class)->finalize (object);
 }
diff --git a/src/graphing/dzl-graph-column.c b/src/graphing/dzl-graph-column.c
index a66a873..d5eef58 100644
--- a/src/graphing/dzl-graph-column.c
+++ b/src/graphing/dzl-graph-column.c
@@ -107,7 +107,7 @@ _dzl_graph_view_column_set_n_rows (DzlGraphColumn *self,
 
   ring = dzl_ring_sized_new (sizeof (GValue), n_rows, NULL);
   dzl_ring_foreach (self->values, dzl_graph_view_column_copy_value, ring);
-  dzl_clear_pointer (&self->values, dzl_ring_unref);
+  g_clear_pointer (&self->values, dzl_ring_unref);
   self->values = ring;
 }
 
@@ -225,8 +225,8 @@ dzl_graph_view_column_finalize (GObject *object)
 {
   DzlGraphColumn *self = (DzlGraphColumn *)object;
 
-  dzl_clear_pointer (&self->name, g_free);
-  dzl_clear_pointer (&self->values, dzl_ring_unref);
+  g_clear_pointer (&self->name, g_free);
+  g_clear_pointer (&self->values, dzl_ring_unref);
 
   G_OBJECT_CLASS (dzl_graph_view_column_parent_class)->finalize (object);
 }
diff --git a/src/graphing/dzl-graph-model.c b/src/graphing/dzl-graph-model.c
index be15e73..84b8378 100644
--- a/src/graphing/dzl-graph-model.c
+++ b/src/graphing/dzl-graph-model.c
@@ -447,7 +447,7 @@ dzl_graph_view_model_finalize (GObject *object)
   DzlGraphModel *self = (DzlGraphModel *)object;
   DzlGraphModelPrivate *priv = dzl_graph_view_model_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->columns, g_ptr_array_unref);
+  g_clear_pointer (&priv->columns, g_ptr_array_unref);
   g_clear_object (&priv->timestamps);
 
   G_OBJECT_CLASS (dzl_graph_view_model_parent_class)->finalize (object);
diff --git a/src/graphing/dzl-graph-view.c b/src/graphing/dzl-graph-view.c
index e72616f..9920cea 100644
--- a/src/graphing/dzl-graph-view.c
+++ b/src/graphing/dzl-graph-view.c
@@ -288,7 +288,7 @@ dzl_graph_view_size_allocate (GtkWidget     *widget,
   gtk_widget_get_allocation (widget, &old_alloc);
 
   if ((old_alloc.width != alloc->width) || (old_alloc.height != alloc->height))
-    dzl_clear_pointer (&priv->surface, cairo_surface_destroy);
+    g_clear_pointer (&priv->surface, cairo_surface_destroy);
 
   GTK_WIDGET_CLASS (dzl_graph_view_parent_class)->size_allocate (widget, alloc);
 }
@@ -333,7 +333,7 @@ dzl_graph_view_destroy (GtkWidget *widget)
       priv->tick_handler = 0;
     }
 
-  dzl_clear_pointer (&priv->surface, cairo_surface_destroy);
+  g_clear_pointer (&priv->surface, cairo_surface_destroy);
 
   GTK_WIDGET_CLASS (dzl_graph_view_parent_class)->destroy (widget);
 }
@@ -346,7 +346,7 @@ dzl_graph_view_finalize (GObject *object)
 
   g_clear_object (&priv->model);
   g_clear_object (&priv->model_signals);
-  dzl_clear_pointer (&priv->renderers, g_ptr_array_unref);
+  g_clear_pointer (&priv->renderers, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_graph_view_parent_class)->finalize (object);
 }
diff --git a/src/menus/dzl-joined-menu.c b/src/menus/dzl-joined-menu.c
index e502ab9..9823eca 100644
--- a/src/menus/dzl-joined-menu.c
+++ b/src/menus/dzl-joined-menu.c
@@ -175,7 +175,7 @@ dzl_joined_menu_finalize (GObject *object)
 {
   DzlJoinedMenu *self = (DzlJoinedMenu *)object;
 
-  dzl_clear_pointer (&self->menus, g_array_unref);
+  g_clear_pointer (&self->menus, g_array_unref);
 
   G_OBJECT_CLASS (dzl_joined_menu_parent_class)->finalize (object);
 }
diff --git a/src/menus/dzl-menu-manager.c b/src/menus/dzl-menu-manager.c
index f09d77f..541bc71 100644
--- a/src/menus/dzl-menu-manager.c
+++ b/src/menus/dzl-menu-manager.c
@@ -80,7 +80,7 @@ dzl_menu_manager_dispose (GObject *object)
 {
   DzlMenuManager *self = (DzlMenuManager *)object;
 
-  dzl_clear_pointer (&self->models, g_hash_table_unref);
+  g_clear_pointer (&self->models, g_hash_table_unref);
 
   G_OBJECT_CLASS (dzl_menu_manager_parent_class)->dispose (object);
 }
diff --git a/src/panel/dzl-dock-manager.c b/src/panel/dzl-dock-manager.c
index 80c45d1..d4597ea 100644
--- a/src/panel/dzl-dock-manager.c
+++ b/src/panel/dzl-dock-manager.c
@@ -272,7 +272,7 @@ dzl_dock_manager_finalize (GObject *object)
 
   g_clear_object (&priv->grab);
 
-  dzl_clear_pointer (&priv->queued_focus_by_toplevel, g_hash_table_unref);
+  g_clear_pointer (&priv->queued_focus_by_toplevel, g_hash_table_unref);
 
   dzl_clear_source (&priv->queued_handler);
 
@@ -284,7 +284,7 @@ dzl_dock_manager_finalize (GObject *object)
       g_ptr_array_remove_index (priv->docks, priv->docks->len - 1);
     }
 
-  dzl_clear_pointer (&priv->docks, g_ptr_array_unref);
+  g_clear_pointer (&priv->docks, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_dock_manager_parent_class)->finalize (object);
 }
diff --git a/src/panel/dzl-dock-transient-grab.c b/src/panel/dzl-dock-transient-grab.c
index e856d13..4dfd67f 100644
--- a/src/panel/dzl-dock-transient-grab.c
+++ b/src/panel/dzl-dock-transient-grab.c
@@ -67,8 +67,8 @@ dzl_dock_transient_grab_finalize (GObject *object)
                          dzl_dock_transient_grab_weak_notify,
                          self);
 
-  dzl_clear_pointer (&self->items, g_ptr_array_unref);
-  dzl_clear_pointer (&self->hidden, g_hash_table_unref);
+  g_clear_pointer (&self->items, g_ptr_array_unref);
+  g_clear_pointer (&self->hidden, g_hash_table_unref);
 
   G_OBJECT_CLASS (dzl_dock_transient_grab_parent_class)->finalize (object);
 }
diff --git a/src/panel/dzl-dock-widget.c b/src/panel/dzl-dock-widget.c
index 6034da2..3fd12b5 100644
--- a/src/panel/dzl-dock-widget.c
+++ b/src/panel/dzl-dock-widget.c
@@ -120,8 +120,8 @@ dzl_dock_widget_finalize (GObject *object)
   DzlDockWidget *self = (DzlDockWidget *)object;
   DzlDockWidgetPrivate *priv = dzl_dock_widget_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->title, g_free);
-  dzl_clear_pointer (&priv->icon_name, g_free);
+  g_clear_pointer (&priv->title, g_free);
+  g_clear_pointer (&priv->icon_name, g_free);
 
   G_OBJECT_CLASS (dzl_dock_widget_parent_class)->finalize (object);
 }
diff --git a/src/panel/dzl-tab-strip.c b/src/panel/dzl-tab-strip.c
index 339ffab..8b5bb7c 100644
--- a/src/panel/dzl-tab-strip.c
+++ b/src/panel/dzl-tab-strip.c
@@ -74,7 +74,7 @@ set_tab_state (GSimpleAction *action,
 
   list = gtk_container_get_children (GTK_CONTAINER (priv->stack));
   nth_child = g_list_nth_data (list, stateval);
-  dzl_clear_pointer (&list, g_list_free);
+  g_clear_pointer (&list, g_list_free);
 
   if (nth_child != NULL)
     {
diff --git a/src/panel/dzl-tab.c b/src/panel/dzl-tab.c
index 3a4b79d..c41d3a0 100644
--- a/src/panel/dzl-tab.c
+++ b/src/panel/dzl-tab.c
@@ -200,8 +200,8 @@ dzl_tab_destroy (GtkWidget *widget)
     }
 
   dzl_clear_weak_pointer (&priv->widget);
-  dzl_clear_pointer (&priv->action_name, g_free);
-  dzl_clear_pointer (&priv->action_target_value, g_variant_unref);
+  g_clear_pointer (&priv->action_name, g_free);
+  g_clear_pointer (&priv->action_target_value, g_variant_unref);
 
   GTK_WIDGET_CLASS (dzl_tab_parent_class)->destroy (widget);
 }
@@ -700,7 +700,7 @@ dzl_tab_set_property (GObject      *object,
       break;
 
     case PROP_ACTION_TARGET:
-      dzl_clear_pointer (&priv->action_target_value, g_variant_unref);
+      g_clear_pointer (&priv->action_target_value, g_variant_unref);
       priv->action_target_value = g_value_get_variant (value);
       if (priv->action_target_value != NULL)
         g_variant_ref_sink (priv->action_target_value);
@@ -1102,7 +1102,7 @@ dzl_tab_set_action_target_value (GtkActionable *actionable,
 
   if (priv->action_target_value != variant)
     {
-      dzl_clear_pointer (&priv->action_target_value, g_variant_unref);
+      g_clear_pointer (&priv->action_target_value, g_variant_unref);
       if (variant != NULL)
         priv->action_target_value = g_variant_ref_sink (variant);
       g_object_notify (G_OBJECT (self), "action-target");
diff --git a/src/pathbar/dzl-path-element.c b/src/pathbar/dzl-path-element.c
index 2f2eff4..c321cff 100644
--- a/src/pathbar/dzl-path-element.c
+++ b/src/pathbar/dzl-path-element.c
@@ -72,9 +72,9 @@ dzl_path_element_finalize (GObject *object)
 {
   DzlPathElement *self = (DzlPathElement *)object;
 
-  dzl_clear_pointer (&self->icon_name, g_free);
-  dzl_clear_pointer (&self->id, g_free);
-  dzl_clear_pointer (&self->title, g_free);
+  g_clear_pointer (&self->icon_name, g_free);
+  g_clear_pointer (&self->id, g_free);
+  g_clear_pointer (&self->title, g_free);
 
   G_OBJECT_CLASS (dzl_path_element_parent_class)->finalize (object);
 }
diff --git a/src/prefs/dzl-preferences-bin.c b/src/prefs/dzl-preferences-bin.c
index 08c20b8..8018532 100644
--- a/src/prefs/dzl-preferences-bin.c
+++ b/src/prefs/dzl-preferences-bin.c
@@ -170,16 +170,16 @@ dzl_preferences_bin_get_settings (DzlPreferencesBin *self)
               dzl_preferences_bin_cache_settings (hash_key, priv->settings);
             }
 
-          dzl_clear_pointer (&schema, g_settings_schema_unref);
+          g_clear_pointer (&schema, g_settings_schema_unref);
         }
       else
         {
           priv->settings = g_object_ref (g_hash_table_lookup (settings_cache, hash_key));
         }
 
-      dzl_clear_pointer (&hash_key, g_free);
-      dzl_clear_pointer (&resolved_schema_id, g_free);
-      dzl_clear_pointer (&resolved_path, g_free);
+      g_clear_pointer (&hash_key, g_free);
+      g_clear_pointer (&resolved_schema_id, g_free);
+      g_clear_pointer (&resolved_path, g_free);
     }
 
   return (priv->settings != NULL) ? g_object_ref (priv->settings) : NULL;
@@ -273,10 +273,10 @@ dzl_preferences_bin_finalize (GObject *object)
   DzlPreferencesBin *self = (DzlPreferencesBin *)object;
   DzlPreferencesBinPrivate *priv = dzl_preferences_bin_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->schema_id, g_free);
-  dzl_clear_pointer (&priv->path, g_free);
-  dzl_clear_pointer (&priv->keywords, g_free);
-  dzl_clear_pointer (&priv->map, g_hash_table_unref);
+  g_clear_pointer (&priv->schema_id, g_free);
+  g_clear_pointer (&priv->path, g_free);
+  g_clear_pointer (&priv->keywords, g_free);
+  g_clear_pointer (&priv->map, g_hash_table_unref);
   g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (dzl_preferences_bin_parent_class)->finalize (object);
@@ -418,7 +418,7 @@ _dzl_preferences_bin_set_map (DzlPreferencesBin *self,
 
   if (map != priv->map)
     {
-      dzl_clear_pointer (&priv->map, g_hash_table_unref);
+      g_clear_pointer (&priv->map, g_hash_table_unref);
       priv->map = map ? g_hash_table_ref (map) : NULL;
       dzl_preferences_bin_reload (self);
     }
diff --git a/src/prefs/dzl-preferences-file-chooser-button.c b/src/prefs/dzl-preferences-file-chooser-button.c
index 2f54bfe..960429b 100644
--- a/src/prefs/dzl-preferences-file-chooser-button.c
+++ b/src/prefs/dzl-preferences-file-chooser-button.c
@@ -123,7 +123,7 @@ dzl_preferences_file_chooser_button_finalize (GObject *object)
 {
   DzlPreferencesFileChooserButton *self = (DzlPreferencesFileChooserButton *)object;
 
-  dzl_clear_pointer (&self->key, g_free);
+  g_clear_pointer (&self->key, g_free);
   g_clear_object (&self->settings);
 
   G_OBJECT_CLASS (dzl_preferences_file_chooser_button_parent_class)->finalize (object);
diff --git a/src/prefs/dzl-preferences-font-button.c b/src/prefs/dzl-preferences-font-button.c
index 747d2e2..1ebed1d 100644
--- a/src/prefs/dzl-preferences-font-button.c
+++ b/src/prefs/dzl-preferences-font-button.c
@@ -105,7 +105,7 @@ dzl_preferences_font_button_changed (DzlPreferencesFontButton *self,
       g_free (font_size);
     }
 
-  dzl_clear_pointer (&font_desc, pango_font_description_free);
+  g_clear_pointer (&font_desc, pango_font_description_free);
   g_free (name);
 }
 
@@ -171,7 +171,7 @@ dzl_preferences_font_button_finalize (GObject *object)
   DzlPreferencesFontButton *self = (DzlPreferencesFontButton *)object;
 
   g_clear_object (&self->settings);
-  dzl_clear_pointer (&self->key, g_free);
+  g_clear_pointer (&self->key, g_free);
 
   G_OBJECT_CLASS (dzl_preferences_font_button_parent_class)->finalize (object);
 }
diff --git a/src/prefs/dzl-preferences-group.c b/src/prefs/dzl-preferences-group.c
index 9e6f12a..6142054 100644
--- a/src/prefs/dzl-preferences-group.c
+++ b/src/prefs/dzl-preferences-group.c
@@ -135,7 +135,7 @@ dzl_preferences_group_finalize (GObject *object)
 {
   DzlPreferencesGroup *self = (DzlPreferencesGroup *)object;
 
-  dzl_clear_pointer (&self->widgets, g_ptr_array_unref);
+  g_clear_pointer (&self->widgets, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_preferences_group_parent_class)->finalize (object);
 }
diff --git a/src/prefs/dzl-preferences-page.c b/src/prefs/dzl-preferences-page.c
index cb7f6a8..f8db6ab 100644
--- a/src/prefs/dzl-preferences-page.c
+++ b/src/prefs/dzl-preferences-page.c
@@ -43,7 +43,7 @@ dzl_preferences_page_finalize (GObject *object)
 {
   DzlPreferencesPage *self = (DzlPreferencesPage *)object;
 
-  dzl_clear_pointer (&self->groups_by_name, g_hash_table_unref);
+  g_clear_pointer (&self->groups_by_name, g_hash_table_unref);
 
   G_OBJECT_CLASS (dzl_preferences_page_parent_class)->finalize (object);
 }
diff --git a/src/prefs/dzl-preferences-spin-button.c b/src/prefs/dzl-preferences-spin-button.c
index 11d3145..8a41b9f 100644
--- a/src/prefs/dzl-preferences-spin-button.c
+++ b/src/prefs/dzl-preferences-spin-button.c
@@ -137,7 +137,7 @@ dzl_preferences_spin_button_value_changed (DzlPreferencesSpinButton *self,
 
   g_variant_ref_sink (variant);
   g_settings_set_value (self->settings, self->key, variant);
-  dzl_clear_pointer (&variant, g_variant_unref);
+  g_clear_pointer (&variant, g_variant_unref);
 }
 
 static void
@@ -220,14 +220,14 @@ dzl_preferences_spin_button_connect (DzlPreferencesBin *bin,
   dzl_preferences_spin_button_setting_changed (self, self->key, self->settings);
 
 cleanup:
-  dzl_clear_pointer (&key, g_settings_schema_key_unref);
-  dzl_clear_pointer (&type, g_free);
-  dzl_clear_pointer (&signal_detail, g_free);
-  dzl_clear_pointer (&range, g_variant_unref);
-  dzl_clear_pointer (&values, g_variant_unref);
-  dzl_clear_pointer (&lower, g_variant_unref);
-  dzl_clear_pointer (&upper, g_variant_unref);
-  dzl_clear_pointer (&schema, g_settings_schema_unref);
+  g_clear_pointer (&key, g_settings_schema_key_unref);
+  g_clear_pointer (&type, g_free);
+  g_clear_pointer (&signal_detail, g_free);
+  g_clear_pointer (&range, g_variant_unref);
+  g_clear_pointer (&values, g_variant_unref);
+  g_clear_pointer (&lower, g_variant_unref);
+  g_clear_pointer (&upper, g_variant_unref);
+  g_clear_pointer (&schema, g_settings_schema_unref);
 }
 
 static void
@@ -271,7 +271,7 @@ dzl_preferences_spin_button_finalize (GObject *object)
 {
   DzlPreferencesSpinButton *self = (DzlPreferencesSpinButton *)object;
 
-  dzl_clear_pointer (&self->key, g_free);
+  g_clear_pointer (&self->key, g_free);
   g_clear_object (&self->settings);
 
   G_OBJECT_CLASS (dzl_preferences_spin_button_parent_class)->finalize (object);
diff --git a/src/prefs/dzl-preferences-switch.c b/src/prefs/dzl-preferences-switch.c
index 90608d4..d34baf2 100644
--- a/src/prefs/dzl-preferences-switch.c
+++ b/src/prefs/dzl-preferences-switch.c
@@ -276,8 +276,8 @@ dzl_preferences_switch_finalize (GObject *object)
 {
   DzlPreferencesSwitch *self = (DzlPreferencesSwitch *)object;
 
-  dzl_clear_pointer (&self->key, g_free);
-  dzl_clear_pointer (&self->target, g_variant_unref);
+  g_clear_pointer (&self->key, g_free);
+  g_clear_pointer (&self->target, g_variant_unref);
   g_clear_object (&self->settings);
 
   G_OBJECT_CLASS (dzl_preferences_switch_parent_class)->finalize (object);
diff --git a/src/prefs/dzl-preferences-view.c b/src/prefs/dzl-preferences-view.c
index fab6439..19091bd 100644
--- a/src/prefs/dzl-preferences-view.c
+++ b/src/prefs/dzl-preferences-view.c
@@ -144,7 +144,7 @@ dzl_preferences_view_refilter (DzlPreferencesView *self,
                          dzl_preferences_view_refilter_cb,
                          spec);
 
-  dzl_clear_pointer (&spec, dzl_pattern_spec_unref);
+  g_clear_pointer (&spec, dzl_pattern_spec_unref);
 }
 
 static gint
@@ -221,8 +221,8 @@ dzl_preferences_view_finalize (GObject *object)
   DzlPreferencesView *self = (DzlPreferencesView *)object;
   DzlPreferencesViewPrivate *priv = dzl_preferences_view_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->pages, g_sequence_free);
-  dzl_clear_pointer (&priv->widgets, g_hash_table_unref);
+  g_clear_pointer (&priv->pages, g_sequence_free);
+  g_clear_pointer (&priv->widgets, g_hash_table_unref);
   g_clear_object (&priv->actions);
 
   G_OBJECT_CLASS (dzl_preferences_view_parent_class)->finalize (object);
diff --git a/src/search/dzl-fuzzy-index-builder.c b/src/search/dzl-fuzzy-index-builder.c
index 7f3e0a0..7f74204 100644
--- a/src/search/dzl-fuzzy-index-builder.c
+++ b/src/search/dzl-fuzzy-index-builder.c
@@ -136,13 +136,13 @@ dzl_fuzzy_index_builder_finalize (GObject *object)
 {
   DzlFuzzyIndexBuilder *self = (DzlFuzzyIndexBuilder *)object;
 
-  dzl_clear_pointer (&self->documents_hash, g_hash_table_unref);
-  dzl_clear_pointer (&self->documents, g_ptr_array_unref);
-  dzl_clear_pointer (&self->strings, g_string_chunk_free);
-  dzl_clear_pointer (&self->kv_pairs, g_array_unref);
-  dzl_clear_pointer (&self->metadata, g_hash_table_unref);
-  dzl_clear_pointer (&self->key_ids, g_hash_table_unref);
-  dzl_clear_pointer (&self->keys, g_ptr_array_unref);
+  g_clear_pointer (&self->documents_hash, g_hash_table_unref);
+  g_clear_pointer (&self->documents, g_ptr_array_unref);
+  g_clear_pointer (&self->strings, g_string_chunk_free);
+  g_clear_pointer (&self->kv_pairs, g_array_unref);
+  g_clear_pointer (&self->metadata, g_hash_table_unref);
+  g_clear_pointer (&self->key_ids, g_hash_table_unref);
+  g_clear_pointer (&self->keys, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_fuzzy_index_builder_parent_class)->finalize (object);
 }
diff --git a/src/search/dzl-fuzzy-index-cursor.c b/src/search/dzl-fuzzy-index-cursor.c
index ab9368d..6e943d1 100644
--- a/src/search/dzl-fuzzy-index-cursor.c
+++ b/src/search/dzl-fuzzy-index-cursor.c
@@ -125,9 +125,9 @@ dzl_fuzzy_index_cursor_finalize (GObject *object)
   DzlFuzzyIndexCursor *self = (DzlFuzzyIndexCursor *)object;
 
   g_clear_object (&self->index);
-  dzl_clear_pointer (&self->query, g_free);
-  dzl_clear_pointer (&self->matches, g_array_unref);
-  dzl_clear_pointer (&self->tables, g_variant_dict_unref);
+  g_clear_pointer (&self->query, g_free);
+  g_clear_pointer (&self->matches, g_array_unref);
+  g_clear_pointer (&self->tables, g_variant_dict_unref);
 
   G_OBJECT_CLASS (dzl_fuzzy_index_cursor_parent_class)->finalize (object);
 }
diff --git a/src/search/dzl-fuzzy-index-match.c b/src/search/dzl-fuzzy-index-match.c
index ac28475..b290549 100644
--- a/src/search/dzl-fuzzy-index-match.c
+++ b/src/search/dzl-fuzzy-index-match.c
@@ -50,8 +50,8 @@ dzl_fuzzy_index_match_finalize (GObject *object)
 {
   DzlFuzzyIndexMatch *self = (DzlFuzzyIndexMatch *)object;
 
-  dzl_clear_pointer (&self->document, g_variant_unref);
-  dzl_clear_pointer (&self->key, g_free);
+  g_clear_pointer (&self->document, g_variant_unref);
+  g_clear_pointer (&self->key, g_free);
 
   G_OBJECT_CLASS (dzl_fuzzy_index_match_parent_class)->finalize (object);
 }
diff --git a/src/search/dzl-fuzzy-index.c b/src/search/dzl-fuzzy-index.c
index 05c5bc1..8c5892d 100644
--- a/src/search/dzl-fuzzy-index.c
+++ b/src/search/dzl-fuzzy-index.c
@@ -105,13 +105,13 @@ dzl_fuzzy_index_finalize (GObject *object)
 {
   DzlFuzzyIndex *self = (DzlFuzzyIndex *)object;
 
-  dzl_clear_pointer (&self->mapped_file, g_mapped_file_unref);
-  dzl_clear_pointer (&self->variant, g_variant_unref);
-  dzl_clear_pointer (&self->documents, g_variant_unref);
-  dzl_clear_pointer (&self->keys, g_variant_unref);
-  dzl_clear_pointer (&self->tables, g_variant_dict_unref);
-  dzl_clear_pointer (&self->lookaside, g_variant_unref);
-  dzl_clear_pointer (&self->metadata, g_variant_dict_unref);
+  g_clear_pointer (&self->mapped_file, g_mapped_file_unref);
+  g_clear_pointer (&self->variant, g_variant_unref);
+  g_clear_pointer (&self->documents, g_variant_unref);
+  g_clear_pointer (&self->keys, g_variant_unref);
+  g_clear_pointer (&self->tables, g_variant_dict_unref);
+  g_clear_pointer (&self->lookaside, g_variant_unref);
+  g_clear_pointer (&self->metadata, g_variant_dict_unref);
 
   G_OBJECT_CLASS (dzl_fuzzy_index_parent_class)->finalize (object);
 }
diff --git a/src/search/dzl-fuzzy-mutable-index.c b/src/search/dzl-fuzzy-mutable-index.c
index 81af80c..d737406 100644
--- a/src/search/dzl-fuzzy-mutable-index.c
+++ b/src/search/dzl-fuzzy-mutable-index.c
@@ -523,7 +523,7 @@ cleanup:
   g_free (downcase);
   g_free (lookup.state);
   g_free (lookup.tables);
-  dzl_clear_pointer (&lookup.matches, g_hash_table_unref);
+  g_clear_pointer (&lookup.matches, g_hash_table_unref);
 
   return matches;
 }
@@ -539,7 +539,7 @@ dzl_fuzzy_mutable_index_contains (DzlFuzzyMutableIndex *fuzzy,
 
   ar = dzl_fuzzy_mutable_index_match (fuzzy, key, 1);
   ret = (ar != NULL) && (ar->len > 0);
-  dzl_clear_pointer (&ar, g_array_unref);
+  g_clear_pointer (&ar, g_array_unref);
 
   return ret;
 }
@@ -568,7 +568,7 @@ dzl_fuzzy_mutable_index_remove (DzlFuzzyMutableIndex *fuzzy,
         }
     }
 
-  dzl_clear_pointer (&ar, g_array_unref);
+  g_clear_pointer (&ar, g_array_unref);
 }
 
 gchar *
diff --git a/src/search/dzl-pattern-spec.c b/src/search/dzl-pattern-spec.c
index 24e91cc..5d721c6 100644
--- a/src/search/dzl-pattern-spec.c
+++ b/src/search/dzl-pattern-spec.c
@@ -119,8 +119,8 @@ dzl_pattern_spec_get_text (DzlPatternSpec *self)
 static void
 dzl_pattern_spec_free (DzlPatternSpec *self)
 {
-  dzl_clear_pointer (&self->parts, g_strfreev);
-  dzl_clear_pointer (&self->needle, g_free);
+  g_clear_pointer (&self->parts, g_strfreev);
+  g_clear_pointer (&self->needle, g_free);
   g_slice_free (DzlPatternSpec, self);
 }
 
diff --git a/src/settings/dzl-settings-sandwich.c b/src/settings/dzl-settings-sandwich.c
index be40d09..0d4bf2a 100644
--- a/src/settings/dzl-settings-sandwich.c
+++ b/src/settings/dzl-settings-sandwich.c
@@ -153,9 +153,9 @@ dzl_settings_sandwich_finalize (GObject *object)
 {
   DzlSettingsSandwich *self = (DzlSettingsSandwich *)object;
 
-  dzl_clear_pointer (&self->settings, g_ptr_array_unref);
-  dzl_clear_pointer (&self->schema_id, g_free);
-  dzl_clear_pointer (&self->path, g_free);
+  g_clear_pointer (&self->settings, g_ptr_array_unref);
+  g_clear_pointer (&self->schema_id, g_free);
+  g_clear_pointer (&self->path, g_free);
   g_clear_object (&self->memory_backend);
 
   G_OBJECT_CLASS (dzl_settings_sandwich_parent_class)->finalize (object);
diff --git a/src/shortcuts/dzl-shortcut-accel-dialog.c b/src/shortcuts/dzl-shortcut-accel-dialog.c
index 7650119..e78288b 100644
--- a/src/shortcuts/dzl-shortcut-accel-dialog.c
+++ b/src/shortcuts/dzl-shortcut-accel-dialog.c
@@ -341,8 +341,8 @@ dzl_shortcut_accel_dialog_finalize (GObject *object)
 {
   DzlShortcutAccelDialog *self = (DzlShortcutAccelDialog *)object;
 
-  dzl_clear_pointer (&self->shortcut_title, g_free);
-  dzl_clear_pointer (&self->chord, dzl_shortcut_chord_free);
+  g_clear_pointer (&self->shortcut_title, g_free);
+  g_clear_pointer (&self->chord, dzl_shortcut_chord_free);
 
   G_OBJECT_CLASS (dzl_shortcut_accel_dialog_parent_class)->finalize (object);
 }
diff --git a/src/shortcuts/dzl-shortcut-chord.c b/src/shortcuts/dzl-shortcut-chord.c
index 8e14fe7..a9d16ab 100644
--- a/src/shortcuts/dzl-shortcut-chord.c
+++ b/src/shortcuts/dzl-shortcut-chord.c
@@ -119,7 +119,7 @@ dzl_shortcut_chord_new_from_event (const GdkEventKey *key)
     self->keys[0].modifier |= GDK_SHIFT_MASK;
 
   if (!dzl_shortcut_chord_is_valid (self))
-    dzl_clear_pointer (&self, dzl_shortcut_chord_free);
+    g_clear_pointer (&self, dzl_shortcut_chord_free);
 
   return self;
 }
@@ -148,7 +148,7 @@ dzl_shortcut_chord_new_from_string (const gchar *accelerator)
 
   /* Ensure we got a valid first key at least */
   if (!dzl_shortcut_chord_is_valid (self))
-    dzl_clear_pointer (&self, dzl_shortcut_chord_free);
+    g_clear_pointer (&self, dzl_shortcut_chord_free);
 
   return self;
 }
diff --git a/src/shortcuts/dzl-shortcut-closure-chain.c b/src/shortcuts/dzl-shortcut-closure-chain.c
index 0fe242c..6e26adf 100644
--- a/src/shortcuts/dzl-shortcut-closure-chain.c
+++ b/src/shortcuts/dzl-shortcut-closure-chain.c
@@ -94,14 +94,14 @@ dzl_shortcut_closure_chain_free (DzlShortcutClosureChain *chain)
   chain->node.data = NULL;
 
   if (chain->type == DZL_SHORTCUT_CLOSURE_ACTION)
-    dzl_clear_pointer (&chain->action.params, g_variant_unref);
+    g_clear_pointer (&chain->action.params, g_variant_unref);
   else if (chain->type == DZL_SHORTCUT_CLOSURE_CALLBACK)
     {
       if (chain->callback.notify)
-        dzl_clear_pointer (&chain->callback.user_data, chain->callback.notify);
+        g_clear_pointer (&chain->callback.user_data, chain->callback.notify);
     }
   else if (chain->type == DZL_SHORTCUT_CLOSURE_SIGNAL)
-    dzl_clear_pointer (&chain->signal.params, g_array_unref);
+    g_clear_pointer (&chain->signal.params, g_array_unref);
 
   g_slice_free (DzlShortcutClosureChain, chain);
 }
diff --git a/src/shortcuts/dzl-shortcut-context.c b/src/shortcuts/dzl-shortcut-context.c
index 4adf7aa..a33d044 100644
--- a/src/shortcuts/dzl-shortcut-context.c
+++ b/src/shortcuts/dzl-shortcut-context.c
@@ -73,7 +73,7 @@ dzl_shortcut_context_finalize (GObject *object)
   DzlShortcutContext *self = (DzlShortcutContext *)object;
   DzlShortcutContextPrivate *priv = dzl_shortcut_context_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->table, dzl_shortcut_chord_table_free);
+  g_clear_pointer (&priv->table, dzl_shortcut_chord_table_free);
 
   G_OBJECT_CLASS (dzl_shortcut_context_parent_class)->finalize (object);
 }
diff --git a/src/shortcuts/dzl-shortcut-controller.c b/src/shortcuts/dzl-shortcut-controller.c
index 6de550f..604bf8f 100644
--- a/src/shortcuts/dzl-shortcut-controller.c
+++ b/src/shortcuts/dzl-shortcut-controller.c
@@ -342,7 +342,7 @@ dzl_shortcut_controller_connect (DzlShortcutController *self)
 
   manager = dzl_shortcut_controller_get_manager (self);
 
-  dzl_clear_pointer (&priv->current_chord, dzl_shortcut_chord_free);
+  g_clear_pointer (&priv->current_chord, dzl_shortcut_chord_free);
   priv->context_name = NULL;
 
   priv->widget_destroy_handler =
@@ -444,8 +444,8 @@ dzl_shortcut_controller_finalize (GObject *object)
       priv->widget = NULL;
     }
 
-  dzl_clear_pointer (&priv->commands, g_hash_table_unref);
-  dzl_clear_pointer (&priv->commands_table, dzl_shortcut_chord_table_free);
+  g_clear_pointer (&priv->commands, g_hash_table_unref);
+  g_clear_pointer (&priv->commands_table, dzl_shortcut_chord_table_free);
   g_clear_object (&priv->root);
 
   while (priv->descendants.length > 0)
@@ -1228,6 +1228,6 @@ _dzl_shortcut_controller_clear (DzlShortcutController *self)
 
   g_return_if_fail (DZL_IS_SHORTCUT_CONTROLLER (self));
 
-  dzl_clear_pointer (&priv->current_chord, dzl_shortcut_chord_free);
+  g_clear_pointer (&priv->current_chord, dzl_shortcut_chord_free);
   g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CURRENT_CHORD]);
 }
diff --git a/src/shortcuts/dzl-shortcut-label.c b/src/shortcuts/dzl-shortcut-label.c
index c581a77..9778b2d 100644
--- a/src/shortcuts/dzl-shortcut-label.c
+++ b/src/shortcuts/dzl-shortcut-label.c
@@ -45,7 +45,7 @@ dzl_shortcut_label_finalize (GObject *object)
 {
   DzlShortcutLabel *self = (DzlShortcutLabel *)object;
 
-  dzl_clear_pointer (&self->chord, dzl_shortcut_chord_free);
+  g_clear_pointer (&self->chord, dzl_shortcut_chord_free);
 
   G_OBJECT_CLASS (dzl_shortcut_label_parent_class)->finalize (object);
 }
diff --git a/src/shortcuts/dzl-shortcut-manager.c b/src/shortcuts/dzl-shortcut-manager.c
index 9553c1c..5974f69 100644
--- a/src/shortcuts/dzl-shortcut-manager.c
+++ b/src/shortcuts/dzl-shortcut-manager.c
@@ -315,9 +315,9 @@ dzl_shortcut_manager_finalize (GObject *object)
       g_clear_object (&priv->theme);
     }
 
-  dzl_clear_pointer (&priv->seen_entries, g_hash_table_unref);
-  dzl_clear_pointer (&priv->themes, g_ptr_array_unref);
-  dzl_clear_pointer (&priv->user_dir, g_free);
+  g_clear_pointer (&priv->seen_entries, g_hash_table_unref);
+  g_clear_pointer (&priv->themes, g_ptr_array_unref);
+  g_clear_pointer (&priv->user_dir, g_free);
   g_clear_object (&priv->internal_theme);
 
   G_OBJECT_CLASS (dzl_shortcut_manager_parent_class)->finalize (object);
diff --git a/src/shortcuts/dzl-shortcut-theme-editor.c b/src/shortcuts/dzl-shortcut-theme-editor.c
index 0fbd05f..b390dda 100644
--- a/src/shortcuts/dzl-shortcut-theme-editor.c
+++ b/src/shortcuts/dzl-shortcut-theme-editor.c
@@ -183,7 +183,7 @@ dzl_shortcut_theme_editor_row_activated (DzlShortcutThemeEditor *self,
       GtkDialog *dialog;
       GtkWidget *toplevel;
 
-      dzl_clear_pointer (&priv->selected, gtk_tree_path_free);
+      g_clear_pointer (&priv->selected, gtk_tree_path_free);
       priv->selected = gtk_tree_path_copy (tree_path);
 
       gtk_tree_model_get (model, &iter,
@@ -292,8 +292,8 @@ dzl_shortcut_theme_editor_finalize (GObject *object)
 
   g_clear_object (&priv->model);
   g_clear_object (&priv->theme);
-  dzl_clear_pointer (&priv->selected, gtk_tree_path_free);
-  dzl_clear_pointer (&priv->attrs, pango_attr_list_unref);
+  g_clear_pointer (&priv->selected, gtk_tree_path_free);
+  g_clear_pointer (&priv->attrs, pango_attr_list_unref);
 
   G_OBJECT_CLASS (dzl_shortcut_theme_editor_parent_class)->finalize (object);
 }
diff --git a/src/shortcuts/dzl-shortcut-theme-load.c b/src/shortcuts/dzl-shortcut-theme-load.c
index 3f6083f..83f90d4 100644
--- a/src/shortcuts/dzl-shortcut-theme-load.c
+++ b/src/shortcuts/dzl-shortcut-theme-load.c
@@ -81,8 +81,8 @@ static void
 load_state_frame_free (LoadStateFrame *frm)
 {
   g_clear_object (&frm->context);
-  dzl_clear_pointer (&frm->accelerator, g_free);
-  dzl_clear_pointer (&frm->signal, g_free);
+  g_clear_pointer (&frm->accelerator, g_free);
+  g_clear_pointer (&frm->signal, g_free);
 
   g_slist_free_full (frm->params, g_free);
   frm->params = NULL;
diff --git a/src/shortcuts/dzl-shortcut-theme.c b/src/shortcuts/dzl-shortcut-theme.c
index be4f826..74d2d8f 100644
--- a/src/shortcuts/dzl-shortcut-theme.c
+++ b/src/shortcuts/dzl-shortcut-theme.c
@@ -97,14 +97,14 @@ dzl_shortcut_theme_finalize (GObject *object)
   DzlShortcutTheme *self = (DzlShortcutTheme *)object;
   DzlShortcutThemePrivate *priv = dzl_shortcut_theme_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->name, g_free);
-  dzl_clear_pointer (&priv->parent_name, g_free);
-  dzl_clear_pointer (&priv->title, g_free);
-  dzl_clear_pointer (&priv->subtitle, g_free);
-  dzl_clear_pointer (&priv->contexts, g_hash_table_unref);
-  dzl_clear_pointer (&priv->chains, g_hash_table_unref);
-  dzl_clear_pointer (&priv->actions_table, dzl_shortcut_chord_table_free);
-  dzl_clear_pointer (&priv->commands_table, dzl_shortcut_chord_table_free);
+  g_clear_pointer (&priv->name, g_free);
+  g_clear_pointer (&priv->parent_name, g_free);
+  g_clear_pointer (&priv->title, g_free);
+  g_clear_pointer (&priv->subtitle, g_free);
+  g_clear_pointer (&priv->contexts, g_hash_table_unref);
+  g_clear_pointer (&priv->chains, g_hash_table_unref);
+  g_clear_pointer (&priv->actions_table, dzl_shortcut_chord_table_free);
+  g_clear_pointer (&priv->commands_table, dzl_shortcut_chord_table_free);
 
   G_OBJECT_CLASS (dzl_shortcut_theme_parent_class)->finalize (object);
 }
diff --git a/src/shortcuts/dzl-shortcuts-section.c b/src/shortcuts/dzl-shortcuts-section.c
index b40f101..a82beeb 100644
--- a/src/shortcuts/dzl-shortcuts-section.c
+++ b/src/shortcuts/dzl-shortcuts-section.c
@@ -225,9 +225,9 @@ dzl_shortcuts_section_finalize (GObject *object)
 {
   DzlShortcutsSection *self = (DzlShortcutsSection *)object;
 
-  dzl_clear_pointer (&self->name, g_free);
-  dzl_clear_pointer (&self->title, g_free);
-  dzl_clear_pointer (&self->view_name, g_free);
+  g_clear_pointer (&self->name, g_free);
+  g_clear_pointer (&self->title, g_free);
+  g_clear_pointer (&self->view_name, g_free);
   g_clear_object (&self->pan_gesture);
 
   G_OBJECT_CLASS (dzl_shortcuts_section_parent_class)->finalize (object);
diff --git a/src/shortcuts/dzl-shortcuts-window.c b/src/shortcuts/dzl-shortcuts-window.c
index d7c4be2..0b91aa6 100644
--- a/src/shortcuts/dzl-shortcuts-window.c
+++ b/src/shortcuts/dzl-shortcuts-window.c
@@ -633,11 +633,11 @@ dzl_shortcuts_window_finalize (GObject *object)
   DzlShortcutsWindow *self = (DzlShortcutsWindow *)object;
   DzlShortcutsWindowPrivate *priv = dzl_shortcuts_window_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->keywords, g_hash_table_unref);
-  dzl_clear_pointer (&priv->initial_section, g_free);
-  dzl_clear_pointer (&priv->view_name, g_free);
-  dzl_clear_pointer (&priv->last_section_name, g_free);
-  dzl_clear_pointer (&priv->search_items_hash, g_hash_table_unref);
+  g_clear_pointer (&priv->keywords, g_hash_table_unref);
+  g_clear_pointer (&priv->initial_section, g_free);
+  g_clear_pointer (&priv->view_name, g_free);
+  g_clear_pointer (&priv->last_section_name, g_free);
+  g_clear_pointer (&priv->search_items_hash, g_hash_table_unref);
 
   g_clear_object (&priv->search_image_group);
   g_clear_object (&priv->search_text_group);
diff --git a/src/statemachine/dzl-state-machine.c b/src/statemachine/dzl-state-machine.c
index 47e7e18..d19671f 100644
--- a/src/statemachine/dzl-state-machine.c
+++ b/src/statemachine/dzl-state-machine.c
@@ -378,8 +378,8 @@ dzl_state_machine_finalize (GObject *object)
         }
     }
 
-  dzl_clear_pointer (&priv->states, g_hash_table_unref);
-  dzl_clear_pointer (&priv->state, g_free);
+  g_clear_pointer (&priv->states, g_hash_table_unref);
+  g_clear_pointer (&priv->state, g_free);
 
   G_OBJECT_CLASS (dzl_state_machine_parent_class)->finalize (object);
 }
diff --git a/src/suggestions/dzl-suggestion-entry-buffer.c b/src/suggestions/dzl-suggestion-entry-buffer.c
index 48a92ac..2f21ddd 100644
--- a/src/suggestions/dzl-suggestion-entry-buffer.c
+++ b/src/suggestions/dzl-suggestion-entry-buffer.c
@@ -56,7 +56,7 @@ dzl_suggestion_entry_buffer_drop_suggestion (DzlSuggestionEntryBuffer *self)
       guint length = GTK_ENTRY_BUFFER_CLASS (dzl_suggestion_entry_buffer_parent_class)->get_length 
(GTK_ENTRY_BUFFER (self));
       guint suffix_len = strlen (priv->suffix);
 
-      dzl_clear_pointer (&priv->suffix, g_free);
+      g_clear_pointer (&priv->suffix, g_free);
       gtk_entry_buffer_emit_deleted_text (GTK_ENTRY_BUFFER (self), length, suffix_len);
     }
 }
@@ -150,7 +150,7 @@ dzl_suggestion_entry_buffer_inserted_text (GtkEntryBuffer *buffer,
 
   g_assert (GTK_IS_ENTRY_BUFFER (buffer));
 
-  dzl_clear_pointer (&priv->text, g_free);
+  g_clear_pointer (&priv->text, g_free);
 
   GTK_ENTRY_BUFFER_CLASS (dzl_suggestion_entry_buffer_parent_class)->inserted_text (buffer, position, chars, 
n_chars);
 }
@@ -165,7 +165,7 @@ dzl_suggestion_entry_buffer_deleted_text (GtkEntryBuffer *buffer,
 
   g_assert (GTK_IS_ENTRY_BUFFER (buffer));
 
-  dzl_clear_pointer (&priv->text, g_free);
+  g_clear_pointer (&priv->text, g_free);
 
   GTK_ENTRY_BUFFER_CLASS (dzl_suggestion_entry_buffer_parent_class)->deleted_text (buffer, position, 
n_chars);
 }
@@ -245,8 +245,8 @@ dzl_suggestion_entry_buffer_finalize (GObject *object)
   DzlSuggestionEntryBufferPrivate *priv = dzl_suggestion_entry_buffer_get_instance_private (self);
 
   g_clear_object (&priv->suggestion);
-  dzl_clear_pointer (&priv->text, g_free);
-  dzl_clear_pointer (&priv->suffix, g_free);
+  g_clear_pointer (&priv->text, g_free);
+  g_clear_pointer (&priv->suffix, g_free);
 
   G_OBJECT_CLASS (dzl_suggestion_entry_buffer_parent_class)->finalize (object);
 }
diff --git a/src/suggestions/dzl-suggestion.c b/src/suggestions/dzl-suggestion.c
index 1b6e70e..684ff1e 100644
--- a/src/suggestions/dzl-suggestion.c
+++ b/src/suggestions/dzl-suggestion.c
@@ -77,9 +77,9 @@ dzl_suggestion_finalize (GObject *object)
 
   priv->icon_name = NULL;
 
-  dzl_clear_pointer (&priv->title, g_free);
-  dzl_clear_pointer (&priv->subtitle, g_free);
-  dzl_clear_pointer (&priv->id, g_free);
+  g_clear_pointer (&priv->title, g_free);
+  g_clear_pointer (&priv->subtitle, g_free);
+  g_clear_pointer (&priv->id, g_free);
 
   G_OBJECT_CLASS (dzl_suggestion_parent_class)->finalize (object);
 }
diff --git a/src/theming/dzl-css-provider.c b/src/theming/dzl-css-provider.c
index c1df6b4..10b942c 100644
--- a/src/theming/dzl-css-provider.c
+++ b/src/theming/dzl-css-provider.c
@@ -253,7 +253,7 @@ dzl_css_provider_finalize (GObject *object)
 {
   DzlCssProvider *self = (DzlCssProvider *)object;
 
-  dzl_clear_pointer (&self->base_path, g_free);
+  g_clear_pointer (&self->base_path, g_free);
   dzl_clear_source (&self->queued_update);
 
   G_OBJECT_CLASS (dzl_css_provider_parent_class)->finalize (object);
diff --git a/src/theming/dzl-theme-manager.c b/src/theming/dzl-theme-manager.c
index ca2fbc1..96d363e 100644
--- a/src/theming/dzl-theme-manager.c
+++ b/src/theming/dzl-theme-manager.c
@@ -39,7 +39,7 @@ dzl_theme_manager_finalize (GObject *object)
 {
   DzlThemeManager *self = (DzlThemeManager *)object;
 
-  dzl_clear_pointer (&self->providers_by_path, g_hash_table_unref);
+  g_clear_pointer (&self->providers_by_path, g_hash_table_unref);
 
   G_OBJECT_CLASS (dzl_theme_manager_parent_class)->finalize (object);
 }
diff --git a/src/tree/dzl-tree-node.c b/src/tree/dzl-tree-node.c
index 4c99bb1..55ea711 100644
--- a/src/tree/dzl-tree-node.c
+++ b/src/tree/dzl-tree-node.c
@@ -723,7 +723,7 @@ dzl_tree_node_finalize (GObject *object)
 
   g_clear_object (&self->item);
   g_clear_object (&self->gicon);
-  dzl_clear_pointer (&self->text, g_free);
+  g_clear_pointer (&self->text, g_free);
 
   g_list_free_full (self->emblems, g_free);
   self->emblems = NULL;
@@ -1086,7 +1086,7 @@ dzl_tree_node_show_popover (DzlTreeNode *self,
 
       path = dzl_tree_node_get_path (self);
       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (tree), path, NULL, FALSE, 0, 0);
-      dzl_clear_pointer (&path, gtk_tree_path_free);
+      g_clear_pointer (&path, gtk_tree_path_free);
 
       /*
        * FIXME: Time period comes from gtk animation duration.
diff --git a/src/tree/dzl-tree-store.c b/src/tree/dzl-tree-store.c
index 1899e16..f19ea8f 100644
--- a/src/tree/dzl-tree-store.c
+++ b/src/tree/dzl-tree-store.c
@@ -230,7 +230,7 @@ dzl_tree_store_drag_data_received (GtkTreeDragDest  *dest,
           gboolean found;
 
           found = gtk_tree_model_get_iter (model, &iter, src_path);
-          dzl_clear_pointer (&src_path, gtk_tree_path_free);
+          g_clear_pointer (&src_path, gtk_tree_path_free);
 
           if (found)
             {
diff --git a/src/tree/dzl-tree.c b/src/tree/dzl-tree.c
index 1137c29..969a195 100644
--- a/src/tree/dzl-tree.c
+++ b/src/tree/dzl-tree.c
@@ -558,7 +558,7 @@ dzl_tree_add (DzlTree     *self,
       gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &parent, path);
       parentptr = &parent;
 
-      dzl_clear_pointer (&path, gtk_tree_path_free);
+      g_clear_pointer (&path, gtk_tree_path_free);
     }
 
   gtk_tree_store_insert_with_values (priv->store, &iter, parentptr,
@@ -829,7 +829,7 @@ dzl_tree_button_press_event (GtkWidget      *widget,
             }
         }
 
-      dzl_clear_pointer (&tree_path, gtk_tree_path_free);
+      g_clear_pointer (&tree_path, gtk_tree_path_free);
 
       return GDK_EVENT_STOP;
     }
@@ -978,7 +978,7 @@ dzl_tree_drag_motion (GtkWidget      *widget,
    * Cache the current drop position so we can use it
    * later to determine how to drop on a given node.
    */
-  dzl_clear_pointer (&priv->last_drop_path, gtk_tree_path_free);
+  g_clear_pointer (&priv->last_drop_path, gtk_tree_path_free);
   gtk_tree_view_get_drag_dest_row (GTK_TREE_VIEW (widget),
                                    &priv->last_drop_path,
                                    &priv->last_drop_pos);
@@ -1001,7 +1001,7 @@ dzl_tree_drag_end (GtkWidget      *widget,
 
   priv->drag_action = 0;
   priv->last_drop_pos = 0;
-  dzl_clear_pointer (&priv->last_drop_path, gtk_tree_path_free);
+  g_clear_pointer (&priv->last_drop_path, gtk_tree_path_free);
 
   GTK_WIDGET_CLASS (dzl_tree_parent_class)->drag_end (widget, context);
 }
@@ -1086,8 +1086,8 @@ dzl_tree_destroy (GtkWidget *widget)
 
   g_assert (DZL_IS_TREE (self));
 
-  dzl_clear_pointer (&priv->last_drop_path, gtk_tree_path_free);
-  dzl_clear_pointer (&priv->builders, g_ptr_array_unref);
+  g_clear_pointer (&priv->last_drop_path, gtk_tree_path_free);
+  g_clear_pointer (&priv->builders, g_ptr_array_unref);
   g_clear_object (&priv->store);
   g_clear_object (&priv->root);
   g_clear_object (&priv->context_menu);
@@ -1842,7 +1842,7 @@ dzl_tree_find_child_node (DzlTree         *self,
   while (gtk_tree_model_iter_next (model, &children));
 
 finish:
-  dzl_clear_pointer (&path, gtk_tree_path_free);
+  g_clear_pointer (&path, gtk_tree_path_free);
 
   return ret;
 }
diff --git a/src/util/dzl-counter.c b/src/util/dzl-counter.c
index bd18950..472e7fc 100644
--- a/src/util/dzl-counter.c
+++ b/src/util/dzl-counter.c
@@ -423,7 +423,7 @@ _dzl_counter_arena_destroy (DzlCounterArena *arena)
     g_free (arena->cells);
 #endif
 
-  dzl_clear_pointer (&arena->counters, g_list_free);
+  g_clear_pointer (&arena->counters, g_list_free);
 
   arena->cells = NULL;
 
diff --git a/src/widgets/dzl-column-layout.c b/src/widgets/dzl-column-layout.c
index 3712a97..8151957 100644
--- a/src/widgets/dzl-column-layout.c
+++ b/src/widgets/dzl-column-layout.c
@@ -591,7 +591,7 @@ dzl_column_layout_finalize (GObject *object)
   DzlColumnLayout *self = (DzlColumnLayout *)object;
   DzlColumnLayoutPrivate *priv = dzl_column_layout_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->children, g_array_unref);
+  g_clear_pointer (&priv->children, g_array_unref);
 
   G_OBJECT_CLASS (dzl_column_layout_parent_class)->finalize (object);
 }
diff --git a/src/widgets/dzl-counters-window.c b/src/widgets/dzl-counters-window.c
index 382a5fd..df70ae0 100644
--- a/src/widgets/dzl-counters-window.c
+++ b/src/widgets/dzl-counters-window.c
@@ -120,7 +120,7 @@ dzl_counters_window_finalize (GObject *object)
   DzlCountersWindow *self = (DzlCountersWindow *)object;
   DzlCountersWindowPrivate *priv = dzl_counters_window_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->arena, dzl_counter_arena_unref);
+  g_clear_pointer (&priv->arena, dzl_counter_arena_unref);
   g_clear_object (&priv->tree_store);
 
   G_OBJECT_CLASS (dzl_counters_window_parent_class)->finalize (object);
@@ -226,7 +226,7 @@ dzl_counters_window_set_arena (DzlCountersWindow *self,
 
   if (arena != priv->arena)
     {
-      dzl_clear_pointer (&priv->arena, dzl_counter_arena_unref);
+      g_clear_pointer (&priv->arena, dzl_counter_arena_unref);
       if (arena != NULL)
         priv->arena = dzl_counter_arena_ref (arena);
       dzl_counters_window_reload (self);
diff --git a/src/widgets/dzl-file-chooser-entry.c b/src/widgets/dzl-file-chooser-entry.c
index 6192b2c..eddc94f 100644
--- a/src/widgets/dzl-file-chooser-entry.c
+++ b/src/widgets/dzl-file-chooser-entry.c
@@ -246,7 +246,7 @@ dzl_file_chooser_entry_finalize (GObject *object)
 
   g_clear_object (&priv->file);
   g_clear_object (&priv->filter);
-  dzl_clear_pointer (&priv->title, g_free);
+  g_clear_pointer (&priv->title, g_free);
 
   G_OBJECT_CLASS (dzl_file_chooser_entry_parent_class)->finalize (object);
 }
diff --git a/src/widgets/dzl-list-box.c b/src/widgets/dzl-list-box.c
index 167c92e..28004c0 100644
--- a/src/widgets/dzl-list-box.c
+++ b/src/widgets/dzl-list-box.c
@@ -161,7 +161,7 @@ dzl_list_box_constructed (GObject *object)
 failure:
   g_warning ("Invalid DzlListBox instantiated, will not work as expected");
   priv->row_type = G_TYPE_INVALID;
-  dzl_clear_pointer (&priv->property_name, g_free);
+  g_clear_pointer (&priv->property_name, g_free);
 }
 
 static void
@@ -194,7 +194,7 @@ dzl_list_box_finalize (GObject *object)
   DzlListBox *self = (DzlListBox *)object;
   DzlListBoxPrivate *priv = dzl_list_box_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->property_name, g_free);
+  g_clear_pointer (&priv->property_name, g_free);
   priv->row_type = G_TYPE_INVALID;
 
   G_OBJECT_CLASS (dzl_list_box_parent_class)->finalize (object);
diff --git a/src/widgets/dzl-multi-paned.c b/src/widgets/dzl-multi-paned.c
index a08f694..ad1683d 100644
--- a/src/widgets/dzl-multi-paned.c
+++ b/src/widgets/dzl-multi-paned.c
@@ -1985,7 +1985,7 @@ dzl_multi_paned_finalize (GObject *object)
 
   g_assert (priv->children->len == 0);
 
-  dzl_clear_pointer (&priv->children, g_array_unref);
+  g_clear_pointer (&priv->children, g_array_unref);
   g_clear_object (&priv->gesture);
 
   G_OBJECT_CLASS (dzl_multi_paned_parent_class)->finalize (object);
diff --git a/src/widgets/dzl-priority-box.c b/src/widgets/dzl-priority-box.c
index fc8be50..1e9fdcc 100644
--- a/src/widgets/dzl-priority-box.c
+++ b/src/widgets/dzl-priority-box.c
@@ -190,7 +190,7 @@ dzl_priority_box_finalize (GObject *object)
   DzlPriorityBox *self = (DzlPriorityBox *)object;
   DzlPriorityBoxPrivate *priv = dzl_priority_box_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->children, g_array_unref);
+  g_clear_pointer (&priv->children, g_array_unref);
 
   G_OBJECT_CLASS (dzl_priority_box_parent_class)->finalize (object);
 }
diff --git a/src/widgets/dzl-radio-box.c b/src/widgets/dzl-radio-box.c
index 082dbe6..780c536 100644
--- a/src/widgets/dzl-radio-box.c
+++ b/src/widgets/dzl-radio-box.c
@@ -115,8 +115,8 @@ dzl_radio_box_finalize (GObject *object)
   DzlRadioBox *self = (DzlRadioBox *)object;
   DzlRadioBoxPrivate *priv = dzl_radio_box_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->items, g_array_unref);
-  dzl_clear_pointer (&priv->active_id, g_free);
+  g_clear_pointer (&priv->items, g_array_unref);
+  g_clear_pointer (&priv->active_id, g_free);
 
   G_OBJECT_CLASS (dzl_radio_box_parent_class)->finalize (object);
 }
@@ -382,7 +382,7 @@ item_parser_start_element (GMarkupParseContext  *context,
     {
       const gchar *translatable = NULL;
 
-      dzl_clear_pointer (&parser_data->id, g_free);
+      g_clear_pointer (&parser_data->id, g_free);
       g_string_truncate (parser_data->text, 0);
 
       if (!g_markup_collect_attributes (element_name, attribute_names, attribute_values, error,
diff --git a/src/widgets/dzl-simple-label.c b/src/widgets/dzl-simple-label.c
index 3df420e..91b87a5 100644
--- a/src/widgets/dzl-simple-label.c
+++ b/src/widgets/dzl-simple-label.c
@@ -183,7 +183,7 @@ dzl_simple_label_destroy (GtkWidget *widget)
 {
   DzlSimpleLabel *self = (DzlSimpleLabel *)widget;
 
-  dzl_clear_pointer (&self->label, g_free);
+  g_clear_pointer (&self->label, g_free);
   g_clear_object (&self->cached_layout);
 
   GTK_WIDGET_CLASS (dzl_simple_label_parent_class)->destroy (widget);
diff --git a/src/widgets/dzl-slider.c b/src/widgets/dzl-slider.c
index 1e3f5a1..55f3d10 100644
--- a/src/widgets/dzl-slider.c
+++ b/src/widgets/dzl-slider.c
@@ -708,7 +708,7 @@ dzl_slider_finalize (GObject *object)
 
   g_clear_object (&priv->h_adj);
   g_clear_object (&priv->v_adj);
-  dzl_clear_pointer (&priv->children, g_ptr_array_unref);
+  g_clear_pointer (&priv->children, g_ptr_array_unref);
 
   dzl_clear_weak_pointer (&priv->h_anim);
   dzl_clear_weak_pointer (&priv->v_anim);
diff --git a/src/widgets/dzl-stack-list.c b/src/widgets/dzl-stack-list.c
index a871810..df229ff 100644
--- a/src/widgets/dzl-stack-list.c
+++ b/src/widgets/dzl-stack-list.c
@@ -375,7 +375,7 @@ dzl_stack_list_finalize (GObject *object)
   DzlStackList *self = (DzlStackList *)object;
   DzlStackListPrivate *priv = dzl_stack_list_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->models, g_ptr_array_unref);
+  g_clear_pointer (&priv->models, g_ptr_array_unref);
   g_clear_object (&priv->animating_rect);
   g_clear_object (&priv->animation);
 
diff --git a/src/widgets/dzl-three-grid.c b/src/widgets/dzl-three-grid.c
index 4586792..0de5484 100644
--- a/src/widgets/dzl-three-grid.c
+++ b/src/widgets/dzl-three-grid.c
@@ -389,7 +389,7 @@ dzl_three_grid_get_preferred_height_for_width (GtkWidget *widget,
            real_min_height, real_nat_height);
 #endif
 
-  dzl_clear_pointer (&priv->row_infos, g_hash_table_unref);
+  g_clear_pointer (&priv->row_infos, g_hash_table_unref);
   priv->row_infos = g_steal_pointer (&row_infos);
 }
 
@@ -649,8 +649,8 @@ dzl_three_grid_finalize (GObject *object)
   DzlThreeGrid *self = (DzlThreeGrid *)object;
   DzlThreeGridPrivate *priv = dzl_three_grid_get_instance_private (self);
 
-  dzl_clear_pointer (&priv->row_infos, g_hash_table_unref);
-  dzl_clear_pointer (&priv->children, g_ptr_array_unref);
+  g_clear_pointer (&priv->row_infos, g_hash_table_unref);
+  g_clear_pointer (&priv->children, g_ptr_array_unref);
 
   G_OBJECT_CLASS (dzl_three_grid_parent_class)->finalize (object);
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]