[gnome-builder] util: use dzl_set/clear_weak_pointer()

[Christian Hergert <chergert src gnome org>]

commit 1560eca47b3011047c947dbdc39b6205c045c60a
Author: Christian Hergert <chergert redhat com>
Date:   Sun Nov 26 15:09:31 2017 -0800

    util: use dzl_set/clear_weak_pointer()
    
    These are available in dazzle, so we don't need to maintain them here
    anymore.

 src/libide/buffers/ide-buffer-manager.c            |   12 ++++++------
 .../ide-buildconfig-configuration-provider.c       |    4 ++--
 src/libide/files/ide-file-settings.c               |    4 ++--
 src/libide/greeter/ide-greeter-perspective.c       |    6 +++---
 src/libide/ide-macros.h                            |    6 ------
 src/libide/langserv/ide-langserv-rename-provider.c |    5 +++--
 src/libide/projects/ide-project-item.c             |    7 +++++--
 src/libide/sourceview/ide-cursor.c                 |    4 ++--
 .../sourceview/ide-line-change-gutter-renderer.c   |   10 ++++++----
 src/libide/sourceview/ide-source-view.c            |    8 ++++----
 .../beautifier/gb-beautifier-editor-addin.c        |    4 ++--
 src/plugins/clang/ide-clang-highlighter.c          |    4 ++--
 .../code-index/ide-code-index-search-result.c      |    4 ++--
 .../gb-color-picker-document-monitor.c             |    4 ++--
 src/plugins/color-picker/gb-color-picker-prefs.c   |    6 +++---
 src/plugins/command-bar/gb-command-bar.c           |   10 +++++-----
 src/plugins/command-bar/gb-command-vim.c           |    4 ++--
 .../gbp-create-project-genesis-addin.c             |    4 ++--
 src/plugins/ctags/ide-ctags-highlighter.c          |    4 ++--
 src/plugins/file-search/gb-file-search-result.c    |    4 ++--
 .../flatpak/gbp-flatpak-application-addin.c        |    4 ++--
 .../flatpak/gbp-flatpak-configuration-provider.c   |    4 ++--
 src/plugins/flatpak/gbp-flatpak-runtime-provider.c |    4 ++--
 src/plugins/git/ide-git-buffer-change-monitor.c    |    4 ++--
 src/plugins/git/ide-git-remote-callbacks.c         |    4 ++--
 .../history/gbp-history-editor-view-addin.c        |    4 ++--
 src/plugins/history/gbp-history-item.c             |    4 ++--
 src/plugins/sysmon/gb-sysmon-addin.c               |    4 ++--
 src/plugins/terminal/gb-terminal-workbench-addin.c |   10 +++++-----
 src/plugins/xml-pack/ide-xml-highlighter.c         |    8 ++++----
 30 files changed, 82 insertions(+), 82 deletions(-)
---
diff --git a/src/libide/buffers/ide-buffer-manager.c b/src/libide/buffers/ide-buffer-manager.c
index 1468d28..799dd8f 100644
--- a/src/libide/buffers/ide-buffer-manager.c
+++ b/src/libide/buffers/ide-buffer-manager.c
@@ -317,7 +317,7 @@ ide_buffer_manager_set_focus_buffer (IdeBufferManager *self,
 
   previous = self->focus_buffer;
 
-  if (ide_set_weak_pointer (&self->focus_buffer, buffer))
+  if (dzl_set_weak_pointer (&self->focus_buffer, buffer))
     {
       /* notify that we left the previous buffer */
       if (previous)
@@ -1367,7 +1367,7 @@ ide_buffer_manager_dispose (GObject *object)
 {
   IdeBufferManager *self = (IdeBufferManager *)object;
 
-  ide_clear_weak_pointer (&self->focus_buffer);
+  dzl_clear_weak_pointer (&self->focus_buffer);
 
   while (self->buffers->len)
     {
@@ -1696,8 +1696,8 @@ register_auto_save (IdeBufferManager *self,
       AutoSave *state;
 
       state = g_slice_new0 (AutoSave);
-      ide_set_weak_pointer (&state->buffer, buffer);
-      ide_set_weak_pointer (&state->self, self);
+      dzl_set_weak_pointer (&state->buffer, buffer);
+      dzl_set_weak_pointer (&state->self, self);
       state->source_id = g_timeout_add_seconds (self->auto_save_timeout,
                                                 ide_buffer_manager_auto_save_cb,
                                                 state);
@@ -1720,8 +1720,8 @@ unregister_auto_save (IdeBufferManager *self,
     {
       g_hash_table_remove (self->timeouts, buffer);
       dzl_clear_source (&state->source_id);
-      ide_clear_weak_pointer (&state->buffer);
-      ide_clear_weak_pointer (&state->self);
+      dzl_clear_weak_pointer (&state->buffer);
+      dzl_clear_weak_pointer (&state->self);
       g_slice_free (AutoSave, state);
     }
 }
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c 
b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
index d46c2c2..a0996ac 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
@@ -570,7 +570,7 @@ ide_buildconfig_configuration_provider_load_async (IdeConfigurationProvider *pro
   g_assert (IDE_IS_CONFIGURATION_MANAGER (manager));
   g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
 
-  ide_set_weak_pointer (&self->manager, manager);
+  dzl_set_weak_pointer (&self->manager, manager);
 
   /* This task is needed so the caller knows when the load finishes */
   parent_task = g_task_new (self, cancellable, callback, user_data);
@@ -622,7 +622,7 @@ ide_buildconfig_configuration_provider_unload (IdeConfigurationProvider *provide
 
   g_clear_pointer (&self->configurations, g_ptr_array_unref);
 
-  ide_clear_weak_pointer (&self->manager);
+  dzl_clear_weak_pointer (&self->manager);
 
   IDE_EXIT;
 }
diff --git a/src/libide/files/ide-file-settings.c b/src/libide/files/ide-file-settings.c
index ec03965..6171f10 100644
--- a/src/libide/files/ide-file-settings.c
+++ b/src/libide/files/ide-file-settings.c
@@ -160,7 +160,7 @@ ide_file_settings_set_file (IdeFileSettings *self,
   g_return_if_fail (IDE_IS_FILE_SETTINGS (self));
   g_return_if_fail (IDE_IS_FILE (file));
 
-  if (ide_set_weak_pointer (&priv->file, file))
+  if (dzl_set_weak_pointer (&priv->file, file))
     g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_FILE]);
 }
 
@@ -201,7 +201,7 @@ ide_file_settings_finalize (GObject *object)
 
   g_clear_pointer (&priv->children, g_ptr_array_unref);
   g_clear_pointer (&priv->encoding, g_free);
-  ide_clear_weak_pointer (&priv->file);
+  dzl_clear_weak_pointer (&priv->file);
 
   G_OBJECT_CLASS (ide_file_settings_parent_class)->finalize (object);
 
diff --git a/src/libide/greeter/ide-greeter-perspective.c b/src/libide/greeter/ide-greeter-perspective.c
index 8c89425..cf52c9d 100644
--- a/src/libide/greeter/ide-greeter-perspective.c
+++ b/src/libide/greeter/ide-greeter-perspective.c
@@ -677,7 +677,7 @@ update_title_for_matching_addin (PeasExtensionSet *set,
 
       if (binding != NULL)
         {
-          ide_clear_weak_pointer (&state->self->ready_binding);
+          dzl_clear_weak_pointer (&state->self->ready_binding);
           g_binding_unbind (binding);
         }
 
@@ -686,7 +686,7 @@ update_title_for_matching_addin (PeasExtensionSet *set,
                                         state->self->genesis_continue_button,
                                         "sensitive",
                                         G_BINDING_SYNC_CREATE);
-      ide_set_weak_pointer (&state->self->ready_binding, binding);
+      dzl_set_weak_pointer (&state->self->ready_binding, binding);
 
       gtk_label_set_label (state->self->genesis_title, title);
       gtk_button_set_label (state->self->genesis_continue_button, next);
@@ -1200,7 +1200,7 @@ ide_greeter_perspective_finalize (GObject *object)
 {
   IdeGreeterPerspective *self = (IdeGreeterPerspective *)object;
 
-  ide_clear_weak_pointer (&self->ready_binding);
+  dzl_clear_weak_pointer (&self->ready_binding);
   g_clear_pointer (&self->pattern_spec, dzl_pattern_spec_unref);
   g_clear_object (&self->cancellable);
 
diff --git a/src/libide/ide-macros.h b/src/libide/ide-macros.h
index 34c58e6..a9ecf01 100644
--- a/src/libide/ide-macros.h
+++ b/src/libide/ide-macros.h
@@ -23,12 +23,6 @@
 
 G_BEGIN_DECLS
 
-#define ide_clear_weak_pointer(ptr) \
-  (*(ptr) ? (g_object_remove_weak_pointer((GObject*)*(ptr), (gpointer*)ptr),*(ptr)=NULL,1) : 0)
-
-#define ide_set_weak_pointer(ptr,obj) \
-  
((obj!=*(ptr))?(ide_clear_weak_pointer(ptr),*(ptr)=obj,((obj)?g_object_add_weak_pointer((GObject*)obj,(gpointer*)ptr),NULL:NULL),1):0)
-
 #define ide_clear_signal_handler(obj,ptr) \
   G_STMT_START { \
     if (*(ptr) != 0) { \
diff --git a/src/libide/langserv/ide-langserv-rename-provider.c 
b/src/libide/langserv/ide-langserv-rename-provider.c
index cef8ba2..fe1307f 100644
--- a/src/libide/langserv/ide-langserv-rename-provider.c
+++ b/src/libide/langserv/ide-langserv-rename-provider.c
@@ -18,6 +18,7 @@
 
 #define G_LOG_DOMAIN "ide-langserv-rename-provider"
 
+#include <dazzle.h>
 #include <jsonrpc-glib.h>
 
 #include "ide-debug.h"
@@ -56,7 +57,7 @@ ide_langserv_rename_provider_set_buffer (IdeLangservRenameProvider *self,
 {
   IdeLangservRenameProviderPrivate *priv = ide_langserv_rename_provider_get_instance_private (self);
 
-  ide_set_weak_pointer (&priv->buffer, buffer);
+  dzl_set_weak_pointer (&priv->buffer, buffer);
 }
 
 static void
@@ -66,7 +67,7 @@ ide_langserv_rename_provider_finalize (GObject *object)
   IdeLangservRenameProviderPrivate *priv = ide_langserv_rename_provider_get_instance_private (self);
 
   g_clear_object (&priv->client);
-  ide_clear_weak_pointer (&priv->buffer);
+  dzl_clear_weak_pointer (&priv->buffer);
 
   G_OBJECT_CLASS (ide_langserv_rename_provider_parent_class)->finalize (object);
 }
diff --git a/src/libide/projects/ide-project-item.c b/src/libide/projects/ide-project-item.c
index ac64fae..a0d2545 100644
--- a/src/libide/projects/ide-project-item.c
+++ b/src/libide/projects/ide-project-item.c
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define G_LOG_DOMAIN "ide-project-item"
+
+#include <dazzle.h>
 #include <glib/gi18n.h>
 
 #include "projects/ide-project-item.h"
@@ -133,7 +136,7 @@ ide_project_item_set_parent (IdeProjectItem *item,
   g_return_if_fail (IDE_IS_PROJECT_ITEM (item));
   g_return_if_fail (!parent || IDE_IS_PROJECT_ITEM (parent));
 
-  if (ide_set_weak_pointer (&priv->parent, parent))
+  if (dzl_set_weak_pointer (&priv->parent, parent))
     g_object_notify_by_pspec (G_OBJECT (item), properties [PROP_PARENT]);
 }
 
@@ -143,7 +146,7 @@ ide_project_item_finalize (GObject *object)
   IdeProjectItem *self = (IdeProjectItem *)object;
   IdeProjectItemPrivate *priv = ide_project_item_get_instance_private (self);
 
-  ide_clear_weak_pointer (&priv->parent);
+  dzl_clear_weak_pointer (&priv->parent);
   g_clear_pointer (&priv->children, g_sequence_free);
 
   G_OBJECT_CLASS (ide_project_item_parent_class)->finalize (object);
diff --git a/src/libide/sourceview/ide-cursor.c b/src/libide/sourceview/ide-cursor.c
index b33843a..0cb64e4 100644
--- a/src/libide/sourceview/ide-cursor.c
+++ b/src/libide/sourceview/ide-cursor.c
@@ -84,7 +84,7 @@ ide_cursor_dispose (GObject *object)
       if (self->highlight_tag != NULL)
         gtk_text_tag_table_remove (gtk_text_buffer_get_tag_table (buffer),
                                    self->highlight_tag);
-      ide_clear_weak_pointer (&self->source_view);
+      dzl_clear_weak_pointer (&self->source_view);
     }
 
   if (self->operations_signals != NULL)
@@ -770,7 +770,7 @@ ide_cursor_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_IDE_SOURCE_VIEW:
-      ide_set_weak_pointer (&self->source_view, g_value_get_object (value));
+      dzl_set_weak_pointer (&self->source_view, g_value_get_object (value));
       break;
 
     default:
diff --git a/src/libide/sourceview/ide-line-change-gutter-renderer.c 
b/src/libide/sourceview/ide-line-change-gutter-renderer.c
index b08d843..24666c2 100644
--- a/src/libide/sourceview/ide-line-change-gutter-renderer.c
+++ b/src/libide/sourceview/ide-line-change-gutter-renderer.c
@@ -18,6 +18,8 @@
 
 #define G_LOG_DOMAIN "ide-line-change-gutter-renderer"
 
+#include <dazzle.h>
+
 #include "ide-context.h"
 
 #include "buffers/ide-buffer.h"
@@ -87,7 +89,7 @@ disconnect_buffer (IdeLineChangeGutterRenderer *self)
     {
       g_signal_handler_disconnect (self->buffer, self->buffer_notify_style_scheme);
       self->buffer_notify_style_scheme = 0;
-      ide_clear_weak_pointer (&self->buffer);
+      dzl_clear_weak_pointer (&self->buffer);
     }
 }
 
@@ -100,7 +102,7 @@ disconnect_view (IdeLineChangeGutterRenderer *self)
     {
       g_signal_handler_disconnect (self->text_view, self->text_view_notify_buffer);
       self->text_view_notify_buffer = 0;
-      ide_clear_weak_pointer (&self->text_view);
+      dzl_clear_weak_pointer (&self->text_view);
     }
 }
 
@@ -191,7 +193,7 @@ connect_buffer (IdeLineChangeGutterRenderer *self)
 
   if (buffer)
     {
-      ide_set_weak_pointer (&self->buffer, buffer);
+      dzl_set_weak_pointer (&self->buffer, buffer);
       self->buffer_notify_style_scheme = g_signal_connect (buffer,
                                                            "notify::style-scheme",
                                                            G_CALLBACK (notify_style_scheme_cb),
@@ -218,7 +220,7 @@ connect_view (IdeLineChangeGutterRenderer *self)
 
   if (view)
     {
-      ide_set_weak_pointer (&self->text_view, view);
+      dzl_set_weak_pointer (&self->text_view, view);
       self->text_view_notify_buffer = g_signal_connect (self->text_view,
                                                         "notify::buffer",
                                                         G_CALLBACK (notify_buffer_cb),
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index b66af8a..00522d3 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -5510,13 +5510,13 @@ ide_source_view_dispose (GObject *object)
   if (priv->hadj_animation)
     {
       dzl_animation_stop (priv->hadj_animation);
-      ide_clear_weak_pointer (&priv->hadj_animation);
+      dzl_clear_weak_pointer (&priv->hadj_animation);
     }
 
   if (priv->vadj_animation)
     {
       dzl_animation_stop (priv->vadj_animation);
-      ide_clear_weak_pointer (&priv->vadj_animation);
+      dzl_clear_weak_pointer (&priv->vadj_animation);
     }
 
   ide_source_view_clear_snippets (self);
@@ -7709,7 +7709,7 @@ ide_source_view_scroll_to_iter (IdeSourceView        *self,
       if (priv->hadj_animation != NULL)
         {
           dzl_animation_stop (priv->hadj_animation);
-          ide_clear_weak_pointer (&priv->hadj_animation);
+          dzl_clear_weak_pointer (&priv->hadj_animation);
         }
 
       priv->hadj_animation =
@@ -7725,7 +7725,7 @@ ide_source_view_scroll_to_iter (IdeSourceView        *self,
       if (priv->vadj_animation != NULL)
         {
           dzl_animation_stop (priv->vadj_animation);
-          ide_clear_weak_pointer (&priv->vadj_animation);
+          dzl_clear_weak_pointer (&priv->vadj_animation);
         }
 
       priv->vadj_animation =
diff --git a/src/plugins/beautifier/gb-beautifier-editor-addin.c 
b/src/plugins/beautifier/gb-beautifier-editor-addin.c
index 1f184ab..e593fe1 100644
--- a/src/plugins/beautifier/gb-beautifier-editor-addin.c
+++ b/src/plugins/beautifier/gb-beautifier-editor-addin.c
@@ -360,7 +360,7 @@ gb_beautifier_editor_addin_load (IdeEditorAddin       *addin,
   g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
   g_assert (IDE_IS_EDITOR_PERSPECTIVE (editor));
 
-  ide_set_weak_pointer (&self->editor, editor);
+  dzl_set_weak_pointer (&self->editor, editor);
   workbench = ide_widget_get_workbench (GTK_WIDGET (editor));
   self->context = ide_workbench_get_context (workbench);
   self->entries = gb_beautifier_config_get_entries (self, &self->has_default);
@@ -389,7 +389,7 @@ gb_beautifier_editor_addin_unload (IdeEditorAddin       *addin,
       self->entries = NULL;
     }
 
-  ide_clear_weak_pointer (&self->editor);
+  dzl_clear_weak_pointer (&self->editor);
   self->context = NULL;
 }
 
diff --git a/src/plugins/clang/ide-clang-highlighter.c b/src/plugins/clang/ide-clang-highlighter.c
index 0cbc3ff..699bd19 100644
--- a/src/plugins/clang/ide-clang-highlighter.c
+++ b/src/plugins/clang/ide-clang-highlighter.c
@@ -182,7 +182,7 @@ ide_clang_highlighter_real_set_engine (IdeHighlighter     *highlighter,
 {
   IdeClangHighlighter *self = (IdeClangHighlighter *)highlighter;
 
-  ide_set_weak_pointer (&self->engine, engine);
+  dzl_set_weak_pointer (&self->engine, engine);
 }
 
 static void
@@ -190,7 +190,7 @@ ide_clang_highlighter_finalize (GObject *object)
 {
   IdeClangHighlighter *self = (IdeClangHighlighter *)object;
 
-  ide_clear_weak_pointer (&self->engine);
+  dzl_clear_weak_pointer (&self->engine);
 
   G_OBJECT_CLASS (ide_clang_highlighter_parent_class)->finalize (object);
 }
diff --git a/src/plugins/code-index/ide-code-index-search-result.c 
b/src/plugins/code-index/ide-code-index-search-result.c
index 2d857a9..2a19afe 100644
--- a/src/plugins/code-index/ide-code-index-search-result.c
+++ b/src/plugins/code-index/ide-code-index-search-result.c
@@ -83,7 +83,7 @@ ide_code_index_search_result_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_CONTEXT:
-      ide_set_weak_pointer (&self->context, g_value_get_object (value));
+      dzl_set_weak_pointer (&self->context, g_value_get_object (value));
       break;
 
     case PROP_LOCATION:
@@ -100,7 +100,7 @@ ide_code_index_search_result_finalize (GObject *object)
 {
   IdeCodeIndexSearchResult *self = (IdeCodeIndexSearchResult *)object;
 
-  ide_clear_weak_pointer (&self->context);
+  dzl_clear_weak_pointer (&self->context);
   g_clear_pointer (&self->location, ide_source_location_unref);
 
   G_OBJECT_CLASS (ide_code_index_search_result_parent_class)->finalize (object);
diff --git a/src/plugins/color-picker/gb-color-picker-document-monitor.c 
b/src/plugins/color-picker/gb-color-picker-document-monitor.c
index c4ccca7..7ab295b 100644
--- a/src/plugins/color-picker/gb-color-picker-document-monitor.c
+++ b/src/plugins/color-picker/gb-color-picker-document-monitor.c
@@ -514,7 +514,7 @@ gb_color_picker_document_monitor_set_buffer (GbColorPickerDocumentMonitor *self,
   if (self->buffer != buffer && self->buffer != NULL)
     stop_monitor (self);
 
-  if (ide_set_weak_pointer (&self->buffer, buffer))
+  if (dzl_set_weak_pointer (&self->buffer, buffer))
     {
       g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_BUFFER]);
 
@@ -544,7 +544,7 @@ gb_color_picker_document_monitor_finalize (GObject *object)
 {
   GbColorPickerDocumentMonitor *self = (GbColorPickerDocumentMonitor *)object;
 
-  ide_clear_weak_pointer (&self->buffer);
+  dzl_clear_weak_pointer (&self->buffer);
 
   G_OBJECT_CLASS (gb_color_picker_document_monitor_parent_class)->finalize (object);
 }
diff --git a/src/plugins/color-picker/gb-color-picker-prefs.c 
b/src/plugins/color-picker/gb-color-picker-prefs.c
index ec6c3cf..e6986ec 100644
--- a/src/plugins/color-picker/gb-color-picker-prefs.c
+++ b/src/plugins/color-picker/gb-color-picker-prefs.c
@@ -544,13 +544,13 @@ gb_color_picker_prefs_set_panel (GbColorPickerPrefs *self,
           gb_color_picker_prefs_unbind_settings (self);
           gstyle_color_panel_set_prefs_pages (self->panel, NULL, NULL, NULL, NULL);
           gtk_list_box_bind_model (GTK_LIST_BOX (self->palettes_listbox), NULL, NULL, NULL, NULL);
-          ide_clear_weak_pointer (&self->panel);
+          dzl_clear_weak_pointer (&self->panel);
           self->palette_widget = NULL;
         }
 
       if (panel != NULL && GSTYLE_IS_COLOR_PANEL (panel))
         {
-          ide_set_weak_pointer (&self->panel, panel);
+          dzl_set_weak_pointer (&self->panel, panel);
           self->palette_widget = gstyle_color_panel_get_palette_widget (self->panel);
           self->palettes_store = gstyle_palette_widget_get_store (self->palette_widget);
           gtk_list_box_bind_model (GTK_LIST_BOX (self->palettes_listbox),
@@ -633,7 +633,7 @@ gb_color_picker_prefs_finalize (GObject *object)
 {
   GbColorPickerPrefs *self = (GbColorPickerPrefs *)object;
 
-  ide_clear_weak_pointer (&self->panel);
+  dzl_clear_weak_pointer (&self->panel);
 
   g_clear_object (&self->components_page);
   g_clear_object (&self->color_strings_page);
diff --git a/src/plugins/command-bar/gb-command-bar.c b/src/plugins/command-bar/gb-command-bar.c
index 2012d29..33b8c00 100644
--- a/src/plugins/command-bar/gb-command-bar.c
+++ b/src/plugins/command-bar/gb-command-bar.c
@@ -85,7 +85,7 @@ gb_command_bar_load (IdeWorkbenchAddin *addin,
 
   g_assert (GB_IS_COMMAND_BAR (self));
 
-  ide_set_weak_pointer (&self->workbench, workbench);
+  dzl_set_weak_pointer (&self->workbench, workbench);
 
   provider = g_object_new (GB_TYPE_COMMAND_GACTION_PROVIDER,
                            "workbench", self->workbench,
@@ -123,7 +123,7 @@ gb_command_bar_unload (IdeWorkbenchAddin *addin,
    */
 
   g_action_map_remove_action (G_ACTION_MAP (workbench), "show-command-bar");
-  ide_clear_weak_pointer (&self->workbench);
+  dzl_clear_weak_pointer (&self->workbench);
 }
 
 GtkWidget *
@@ -198,7 +198,7 @@ gb_command_bar_set_last_focus (GbCommandBar *self,
   g_return_if_fail (GB_IS_COMMAND_BAR (self));
   g_return_if_fail (!widget || GTK_IS_WIDGET (widget));
 
-  ide_set_weak_pointer (&self->last_focus, widget);
+  dzl_set_weak_pointer (&self->last_focus, widget);
 }
 
 /**
@@ -629,12 +629,12 @@ gb_command_bar_finalize (GObject *object)
 {
   GbCommandBar *self = (GbCommandBar *)object;
 
-  ide_clear_weak_pointer (&self->workbench);
+  dzl_clear_weak_pointer (&self->workbench);
 
   g_clear_pointer (&self->last_completion, g_free);
   g_clear_pointer (&self->saved_text, g_free);
   g_queue_free_full (self->history, g_free);
-  ide_clear_weak_pointer (&self->last_focus);
+  dzl_clear_weak_pointer (&self->last_focus);
 
   G_OBJECT_CLASS (gb_command_bar_parent_class)->finalize (object);
 }
diff --git a/src/plugins/command-bar/gb-command-vim.c b/src/plugins/command-bar/gb-command-vim.c
index 2a38056..f811d93 100644
--- a/src/plugins/command-bar/gb-command-vim.c
+++ b/src/plugins/command-bar/gb-command-vim.c
@@ -58,7 +58,7 @@ gb_command_vim_set_active_widget (GbCommandVim *vim,
   g_return_if_fail (GB_IS_COMMAND_VIM (vim));
   g_return_if_fail (GTK_IS_WIDGET (active_widget));
 
-  if (ide_set_weak_pointer (&vim->active_widget, active_widget))
+  if (dzl_set_weak_pointer (&vim->active_widget, active_widget))
     g_object_notify_by_pspec (G_OBJECT (vim), properties [PROP_ACTIVE_WIDGET]);
 }
 
@@ -113,7 +113,7 @@ gb_command_vim_finalize (GObject *object)
 {
   GbCommandVim *self = GB_COMMAND_VIM (object);
 
-  ide_clear_weak_pointer (&self->active_widget);
+  dzl_clear_weak_pointer (&self->active_widget);
   g_clear_pointer (&self->command_text, g_free);
 
   G_OBJECT_CLASS (gb_command_vim_parent_class)->finalize (object);
diff --git a/src/plugins/create-project/gbp-create-project-genesis-addin.c 
b/src/plugins/create-project/gbp-create-project-genesis-addin.c
index f4b10f1..9d59783 100644
--- a/src/plugins/create-project/gbp-create-project-genesis-addin.c
+++ b/src/plugins/create-project/gbp-create-project-genesis-addin.c
@@ -49,7 +49,7 @@ gbp_create_project_genesis_addin_finalize (GObject *object)
 {
   GbpCreateProjectGenesisAddin *self = (GbpCreateProjectGenesisAddin *)object;
 
-  ide_clear_weak_pointer (&self->widget);
+  dzl_clear_weak_pointer (&self->widget);
 
   G_OBJECT_CLASS (gbp_create_project_genesis_addin_parent_class)->finalize (object);
 }
@@ -123,7 +123,7 @@ gbp_create_project_genesis_addin_get_widget (IdeGenesisAddin *addin)
       widget = g_object_new (GBP_TYPE_CREATE_PROJECT_WIDGET,
                              "visible", TRUE,
                              NULL);
-      ide_set_weak_pointer (&self->widget, widget);
+      dzl_set_weak_pointer (&self->widget, widget);
 
       /*
        * TODO: You need to watch for changes in the widget's entries, and when
diff --git a/src/plugins/ctags/ide-ctags-highlighter.c b/src/plugins/ctags/ide-ctags-highlighter.c
index c827c07..5fb31b6 100644
--- a/src/plugins/ctags/ide-ctags-highlighter.c
+++ b/src/plugins/ctags/ide-ctags-highlighter.c
@@ -248,7 +248,7 @@ ide_ctags_highlighter_real_set_engine (IdeHighlighter      *highlighter,
   context = ide_object_get_context (IDE_OBJECT (self));
   service = ide_context_get_service_typed (context, IDE_TYPE_CTAGS_SERVICE);
 
-  ide_set_weak_pointer (&self->service, service);
+  dzl_set_weak_pointer (&self->service, service);
 
   ide_ctags_service_register_highlighter (service, self);
 }
@@ -261,7 +261,7 @@ ide_ctags_highlighter_finalize (GObject *object)
   if (self->service != NULL)
     {
       ide_ctags_service_unregister_highlighter (self->service, self);
-      ide_clear_weak_pointer (&self->service);
+      dzl_clear_weak_pointer (&self->service);
     }
 
   g_clear_pointer (&self->indexes, g_ptr_array_unref);
diff --git a/src/plugins/file-search/gb-file-search-result.c b/src/plugins/file-search/gb-file-search-result.c
index 25e7a29..a208dc7 100644
--- a/src/plugins/file-search/gb-file-search-result.c
+++ b/src/plugins/file-search/gb-file-search-result.c
@@ -63,7 +63,7 @@ gb_file_search_result_finalize (GObject *object)
 {
   GbFileSearchResult *self = (GbFileSearchResult *)object;
 
-  ide_clear_weak_pointer (&self->context);
+  dzl_clear_weak_pointer (&self->context);
   g_clear_pointer (&self->path, g_free);
 
   G_OBJECT_CLASS (gb_file_search_result_parent_class)->finalize (object);
@@ -99,7 +99,7 @@ gb_file_search_result_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_CONTEXT:
-      ide_set_weak_pointer (&self->context, g_value_get_object (value));
+      dzl_set_weak_pointer (&self->context, g_value_get_object (value));
       break;
 
     case PROP_PATH:
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index 6e966af..ccdda42 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -248,7 +248,7 @@ install_info_free (InstallInfo *info)
                                             info);
     }
 
-  ide_clear_weak_pointer (&info->self);
+  dzl_clear_weak_pointer (&info->self);
   g_clear_object (&info->monitor);
   g_clear_object (&info->installation);
 
@@ -267,7 +267,7 @@ install_info_new (GbpFlatpakApplicationAddin *self,
   info = g_slice_new0 (InstallInfo);
   info->installation = g_object_ref (installation);
   info->monitor = flatpak_installation_create_monitor (installation, NULL, NULL);
-  ide_set_weak_pointer (&info->self, self);
+  dzl_set_weak_pointer (&info->self, self);
 
   if (info->monitor != NULL)
     {
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c 
b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
index 85ea63d..2c3804c 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
@@ -1068,7 +1068,7 @@ gbp_flatpak_configuration_provider_load_async (IdeConfigurationProvider *provide
   g_assert (IDE_IS_CONFIGURATION_MANAGER (manager));
   g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
 
-  ide_set_weak_pointer (&self->manager, manager);
+  dzl_set_weak_pointer (&self->manager, manager);
 
   self->manifest_monitors = g_ptr_array_new_with_free_func (g_object_unref);
 
@@ -1119,7 +1119,7 @@ gbp_flatpak_configuration_provider_unload (IdeConfigurationProvider *provider,
 
   g_clear_pointer (&self->manifest_monitors, g_ptr_array_unref);
 
-  ide_clear_weak_pointer (&self->manager);
+  dzl_clear_weak_pointer (&self->manager);
 
   IDE_EXIT;
 }
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c 
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 6a15c4a..2e1099e 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -150,7 +150,7 @@ gbp_flatpak_runtime_provider_load (IdeRuntimeProvider *provider,
   g_assert (GBP_IS_FLATPAK_RUNTIME_PROVIDER (self));
   g_assert (IDE_IS_RUNTIME_MANAGER (manager));
 
-  ide_set_weak_pointer (&self->manager, manager);
+  dzl_set_weak_pointer (&self->manager, manager);
   self->runtimes = g_ptr_array_new_with_free_func (g_object_unref);
   refs = gbp_flatpak_application_addin_get_runtimes (app_addin);
 
@@ -197,7 +197,7 @@ gbp_flatpak_runtime_provider_unload (IdeRuntimeProvider *provider,
 
   g_clear_pointer (&self->runtimes, g_ptr_array_unref);
 
-  ide_clear_weak_pointer (&self->manager);
+  dzl_clear_weak_pointer (&self->manager);
 
   IDE_EXIT;
 }
diff --git a/src/plugins/git/ide-git-buffer-change-monitor.c b/src/plugins/git/ide-git-buffer-change-monitor.c
index 0819a23..f88ec8f 100644
--- a/src/plugins/git/ide-git-buffer-change-monitor.c
+++ b/src/plugins/git/ide-git-buffer-change-monitor.c
@@ -458,7 +458,7 @@ ide_git_buffer_change_monitor_set_buffer (IdeBufferChangeMonitor *monitor,
   g_return_if_fail (IDE_IS_BUFFER (buffer));
   g_return_if_fail (!self->buffer);
 
-  ide_set_weak_pointer (&self->buffer, buffer);
+  dzl_set_weak_pointer (&self->buffer, buffer);
 
   context = ide_object_get_context (IDE_OBJECT (self));
   vcs = ide_context_get_vcs (context);
@@ -700,7 +700,7 @@ ide_git_buffer_change_monitor_dispose (GObject *object)
       self->changed_timeout = 0;
     }
 
-  ide_clear_weak_pointer (&self->buffer);
+  dzl_clear_weak_pointer (&self->buffer);
 
   g_clear_object (&self->signal_group);
   g_clear_object (&self->vcs_signal_group);
diff --git a/src/plugins/git/ide-git-remote-callbacks.c b/src/plugins/git/ide-git-remote-callbacks.c
index a386cc2..70c72ca 100644
--- a/src/plugins/git/ide-git-remote-callbacks.c
+++ b/src/plugins/git/ide-git-remote-callbacks.c
@@ -98,7 +98,7 @@ ide_git_remote_callbacks__notify_fraction_cb (gpointer data)
 
   if ((animation = self->animation))
     {
-      ide_clear_weak_pointer (&self->animation);
+      dzl_clear_weak_pointer (&self->animation);
       dzl_animation_stop (animation);
     }
 
@@ -108,7 +108,7 @@ ide_git_remote_callbacks__notify_fraction_cb (gpointer data)
                                   NULL,
                                   "fraction", self->fraction,
                                   NULL);
-  ide_set_weak_pointer (&self->animation, animation);
+  dzl_set_weak_pointer (&self->animation, animation);
 
   g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_FRACTION]);
 
diff --git a/src/plugins/history/gbp-history-editor-view-addin.c 
b/src/plugins/history/gbp-history-editor-view-addin.c
index 71fd072..18aa02b 100644
--- a/src/plugins/history/gbp-history-editor-view-addin.c
+++ b/src/plugins/history/gbp-history-editor-view-addin.c
@@ -55,7 +55,7 @@ gbp_history_editor_view_addin_stack_set (IdeEditorViewAddin *addin,
   g_assert (stack_addin != NULL);
   g_assert (GBP_IS_HISTORY_LAYOUT_STACK_ADDIN (stack_addin));
 
-  ide_set_weak_pointer (&self->stack_addin, GBP_HISTORY_LAYOUT_STACK_ADDIN (stack_addin));
+  dzl_set_weak_pointer (&self->stack_addin, GBP_HISTORY_LAYOUT_STACK_ADDIN (stack_addin));
 
   IDE_EXIT;
 }
@@ -263,7 +263,7 @@ gbp_history_editor_view_addin_unload (IdeEditorViewAddin *addin,
                                         G_CALLBACK (gbp_history_editor_view_addin_delete_range),
                                         self);
 
-  ide_clear_weak_pointer (&self->stack_addin);
+  dzl_clear_weak_pointer (&self->stack_addin);
 
   self->editor = NULL;
 }
diff --git a/src/plugins/history/gbp-history-item.c b/src/plugins/history/gbp-history-item.c
index 4d36777..a0f0fa4 100644
--- a/src/plugins/history/gbp-history-item.c
+++ b/src/plugins/history/gbp-history-item.c
@@ -40,7 +40,7 @@ gbp_history_item_dispose (GObject *object)
 {
   GbpHistoryItem *self = (GbpHistoryItem *)object;
 
-  ide_clear_weak_pointer (&self->context);
+  dzl_clear_weak_pointer (&self->context);
 
   if (self->mark != NULL)
     {
@@ -87,7 +87,7 @@ gbp_history_item_new (GtkTextMark *mark)
   item->mark = g_object_ref (mark);
 
   context = ide_buffer_get_context (IDE_BUFFER (buffer));
-  ide_set_weak_pointer (&item->context, context);
+  dzl_set_weak_pointer (&item->context, context);
 
   gtk_text_buffer_get_iter_at_mark (buffer, &iter, mark);
   item->line = gtk_text_iter_get_line (&iter);
diff --git a/src/plugins/sysmon/gb-sysmon-addin.c b/src/plugins/sysmon/gb-sysmon-addin.c
index d44386b..6d6afbf 100644
--- a/src/plugins/sysmon/gb-sysmon-addin.c
+++ b/src/plugins/sysmon/gb-sysmon-addin.c
@@ -58,7 +58,7 @@ gb_sysmon_addin_load (IdeWorkbenchAddin *addin,
                         "expand", TRUE,
                         "visible", TRUE,
                         NULL);
-  ide_set_weak_pointer (&self->panel, panel);
+  dzl_set_weak_pointer (&self->panel, panel);
   gtk_container_add (GTK_CONTAINER (pane), GTK_WIDGET (panel));
 }
 
@@ -74,7 +74,7 @@ gb_sysmon_addin_unload (IdeWorkbenchAddin *addin,
   if (self->panel != NULL)
     {
       gtk_widget_destroy (self->panel);
-      ide_clear_weak_pointer (&self->panel);
+      dzl_clear_weak_pointer (&self->panel);
     }
 }
 
diff --git a/src/plugins/terminal/gb-terminal-workbench-addin.c 
b/src/plugins/terminal/gb-terminal-workbench-addin.c
index 23c681d..64a7e6d 100644
--- a/src/plugins/terminal/gb-terminal-workbench-addin.c
+++ b/src/plugins/terminal/gb-terminal-workbench-addin.c
@@ -142,7 +142,7 @@ on_run_manager_run (GbTerminalWorkbenchAddin *self,
                            "pty", pty,
                            "visible", TRUE,
                            NULL);
-      ide_set_weak_pointer (&self->run_terminal, view);
+      dzl_set_weak_pointer (&self->run_terminal, view);
 
       panel = g_object_new (DZL_TYPE_DOCK_WIDGET,
                             "child", self->run_terminal,
@@ -151,7 +151,7 @@ on_run_manager_run (GbTerminalWorkbenchAddin *self,
                             "title", _("Application Output"),
                             "visible", TRUE,
                             NULL);
-      ide_set_weak_pointer (&self->run_panel, panel);
+      dzl_set_weak_pointer (&self->run_panel, panel);
 
       perspective = ide_workbench_get_perspective_by_name (self->workbench, "editor");
       g_assert (IDE_IS_EDITOR_PERSPECTIVE (perspective));
@@ -244,7 +244,7 @@ gb_terminal_workbench_addin_load (IdeWorkbenchAddin *addin,
 
   context = ide_workbench_get_context (workbench);
 
-  ide_set_weak_pointer (&self->workbench, workbench);
+  dzl_set_weak_pointer (&self->workbench, workbench);
 
   g_action_map_add_action_entries (G_ACTION_MAP (workbench), actions, G_N_ELEMENTS (actions), self);
   gb_terminal_workbench_setup_shortcuts (self, workbench);
@@ -297,13 +297,13 @@ gb_terminal_workbench_addin_unload (IdeWorkbenchAddin *addin,
   if (self->panel_dock_widget != NULL)
     {
       gtk_widget_destroy (self->panel_dock_widget);
-      ide_clear_weak_pointer (&self->panel_dock_widget);
+      dzl_clear_weak_pointer (&self->panel_dock_widget);
     }
 
   if (self->run_panel != NULL)
     {
       gtk_widget_destroy (self->run_panel);
-      ide_clear_weak_pointer (&self->run_panel);
+      dzl_clear_weak_pointer (&self->run_panel);
     }
 }
 
diff --git a/src/plugins/xml-pack/ide-xml-highlighter.c b/src/plugins/xml-pack/ide-xml-highlighter.c
index b199f67..ee29bd1 100644
--- a/src/plugins/xml-pack/ide-xml-highlighter.c
+++ b/src/plugins/xml-pack/ide-xml-highlighter.c
@@ -139,7 +139,7 @@ ide_xml_highlighter_bind_buffer_cb (IdeXmlHighlighter  *self,
   g_assert (IDE_IS_BUFFER (buffer));
   g_assert (DZL_IS_SIGNAL_GROUP (group));
 
-  ide_set_weak_pointer (&self->buffer, GTK_TEXT_BUFFER (buffer));
+  dzl_set_weak_pointer (&self->buffer, GTK_TEXT_BUFFER (buffer));
 
   gtk_text_buffer_get_start_iter (self->buffer, &begin);
   self->iter_mark = gtk_text_buffer_create_mark (self->buffer, NULL, &begin, TRUE);
@@ -162,7 +162,7 @@ ide_xml_highlighter_unbind_buffer_cb (IdeXmlHighlighter  *self,
   gtk_text_buffer_delete_mark (self->buffer, self->iter_mark);
   self->iter_mark = NULL;
 
-  ide_clear_weak_pointer (&self->buffer);
+  dzl_clear_weak_pointer (&self->buffer);
 }
 
 
@@ -219,7 +219,7 @@ ide_xml_highlighter_real_set_engine (IdeHighlighter     *highlighter,
   g_return_if_fail (IDE_IS_XML_HIGHLIGHTER (self));
   g_return_if_fail (IDE_IS_HIGHLIGHT_ENGINE (engine));
 
-  if (ide_set_weak_pointer (&self->engine, engine))
+  if (dzl_set_weak_pointer (&self->engine, engine))
     {
       buffer = ide_highlight_engine_get_buffer (engine);
       /*
@@ -248,7 +248,7 @@ ide_xml_highlighter_dispose (GObject *object)
       self->highlight_timeout = 0;
     }
 
-  ide_clear_weak_pointer (&self->engine);
+  dzl_clear_weak_pointer (&self->engine);
   g_clear_object (&self->signal_group);
 
   G_OBJECT_CLASS (ide_xml_highlighter_parent_class)->dispose (object);