GNOME.org
 

[gnome-builder] build: use g_clear_weak_pointer()

commit 313821e6fd50c3b12b81f1f3c55f1bbfc306fdcb
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 30 15:19:11 2018 -0700

    build: use g_clear_weak_pointer()
    
    GLib gained support a while back for our weak pointer macros. We can just
    use them directly.

 src/libide/buffers/ide-buffer-manager.c                       |  4 ++--
 src/libide/files/ide-file-settings.c                          |  4 ++--
 src/libide/greeter/ide-greeter-perspective.c                  |  6 +++---
 src/libide/langserv/ide-langserv-rename-provider.c            |  4 ++--
 src/libide/layout/ide-layout-grid.c                           |  8 ++++----
 src/libide/projects/ide-project-item.c                        |  4 ++--
 src/libide/sourceview/ide-cursor.c                            |  4 ++--
 src/libide/sourceview/ide-line-change-gutter-renderer.c       |  8 ++++----
 src/libide/sourceview/ide-source-view.c                       |  8 ++++----
 src/plugins/beautifier/gb-beautifier-editor-addin.c           |  6 +++---
 src/plugins/clang/ide-clang-highlighter.c                     |  4 ++--
 src/plugins/color-picker/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 ++--
 src/plugins/create-project/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 ++--
 src/plugins/flatpak/gbp-flatpak-application-addin.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 ++--
 src/plugins/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 +++++-----
 26 files changed, 67 insertions(+), 67 deletions(-)
---
diff --git a/src/libide/buffers/ide-buffer-manager.c b/src/libide/buffers/ide-buffer-manager.c
index fb5cad90d..d27670056 100644
--- a/src/libide/buffers/ide-buffer-manager.c
+++ b/src/libide/buffers/ide-buffer-manager.c
@@ -318,7 +318,7 @@ ide_buffer_manager_set_focus_buffer (IdeBufferManager *self,
 
   previous = self->focus_buffer;
 
-  if (dzl_set_weak_pointer (&self->focus_buffer, buffer))
+  if (g_set_weak_pointer (&self->focus_buffer, buffer))
     {
       /* notify that we left the previous buffer */
       if (previous)
@@ -1343,7 +1343,7 @@ ide_buffer_manager_dispose (GObject *object)
 
   g_assert (IDE_IS_MAIN_THREAD ());
 
-  dzl_clear_weak_pointer (&self->focus_buffer);
+  g_clear_weak_pointer (&self->focus_buffer);
 
   while (self->buffers->len)
     {
diff --git a/src/libide/files/ide-file-settings.c b/src/libide/files/ide-file-settings.c
index 568d3f533..d6a644a2b 100644
--- a/src/libide/files/ide-file-settings.c
+++ b/src/libide/files/ide-file-settings.c
@@ -162,7 +162,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 (dzl_set_weak_pointer (&priv->file, file))
+  if (g_set_weak_pointer (&priv->file, file))
     g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_FILE]);
 }
 
@@ -203,7 +203,7 @@ ide_file_settings_finalize (GObject *object)
 
   g_clear_pointer (&priv->children, g_ptr_array_unref);
   g_clear_pointer (&priv->encoding, g_free);
-  dzl_clear_weak_pointer (&priv->file);
+  g_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 5abe7a70d..4472d94f1 100644
--- a/src/libide/greeter/ide-greeter-perspective.c
+++ b/src/libide/greeter/ide-greeter-perspective.c
@@ -693,7 +693,7 @@ update_title_for_matching_addin (PeasExtensionSet *set,
 
       if (binding != NULL)
         {
-          dzl_clear_weak_pointer (&state->self->ready_binding);
+          g_clear_weak_pointer (&state->self->ready_binding);
           g_binding_unbind (binding);
         }
 
@@ -702,7 +702,7 @@ update_title_for_matching_addin (PeasExtensionSet *set,
                                         state->self->genesis_continue_button,
                                         "sensitive",
                                         G_BINDING_SYNC_CREATE);
-      dzl_set_weak_pointer (&state->self->ready_binding, binding);
+      g_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);
@@ -1254,7 +1254,7 @@ ide_greeter_perspective_finalize (GObject *object)
 {
   IdeGreeterPerspective *self = (IdeGreeterPerspective *)object;
 
-  dzl_clear_weak_pointer (&self->ready_binding);
+  g_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/langserv/ide-langserv-rename-provider.c 
b/src/libide/langserv/ide-langserv-rename-provider.c
index 9d191199d..c240f6e82 100644
--- a/src/libide/langserv/ide-langserv-rename-provider.c
+++ b/src/libide/langserv/ide-langserv-rename-provider.c
@@ -60,7 +60,7 @@ ide_langserv_rename_provider_set_buffer (IdeLangservRenameProvider *self,
 {
   IdeLangservRenameProviderPrivate *priv = ide_langserv_rename_provider_get_instance_private (self);
 
-  dzl_set_weak_pointer (&priv->buffer, buffer);
+  g_set_weak_pointer (&priv->buffer, buffer);
 }
 
 static void
@@ -70,7 +70,7 @@ ide_langserv_rename_provider_finalize (GObject *object)
   IdeLangservRenameProviderPrivate *priv = ide_langserv_rename_provider_get_instance_private (self);
 
   g_clear_object (&priv->client);
-  dzl_clear_weak_pointer (&priv->buffer);
+  g_clear_weak_pointer (&priv->buffer);
 
   G_OBJECT_CLASS (ide_langserv_rename_provider_parent_class)->finalize (object);
 }
diff --git a/src/libide/layout/ide-layout-grid.c b/src/libide/layout/ide-layout-grid.c
index a681f2af6..21899318b 100644
--- a/src/libide/layout/ide-layout-grid.c
+++ b/src/libide/layout/ide-layout-grid.c
@@ -542,7 +542,7 @@ ide_layout_grid_drag_motion (GtkWidget      *widget,
   if (priv->drag_anim != NULL)
     {
       dzl_animation_stop (priv->drag_anim);
-      dzl_clear_weak_pointer (&priv->drag_anim);
+      g_clear_weak_pointer (&priv->drag_anim);
     }
 
   gtk_widget_get_allocation (GTK_WIDGET (self), &alloc);
@@ -573,7 +573,7 @@ ide_layout_grid_drag_motion (GtkWidget      *widget,
                                   "y", area.y,
                                   "height", area.height,
                                   NULL);
-  dzl_set_weak_pointer (&priv->drag_anim, drag_anim);
+  g_set_weak_pointer (&priv->drag_anim, drag_anim);
 
   gtk_widget_queue_draw (GTK_WIDGET (self));
 
@@ -688,7 +688,7 @@ ide_layout_grid_drag_leave (GtkWidget      *widget,
   if (priv->drag_anim != NULL)
     {
       dzl_animation_stop (priv->drag_anim);
-      dzl_clear_weak_pointer (&priv->drag_anim);
+      g_clear_weak_pointer (&priv->drag_anim);
     }
 
   g_clear_object (&priv->drag_theatric);
@@ -709,7 +709,7 @@ ide_layout_grid_drag_failed (GtkWidget      *widget,
   if (priv->drag_anim != NULL)
     {
       dzl_animation_stop (priv->drag_anim);
-      dzl_clear_weak_pointer (&priv->drag_anim);
+      g_clear_weak_pointer (&priv->drag_anim);
     }
 
   g_clear_object (&priv->drag_theatric);
diff --git a/src/libide/projects/ide-project-item.c b/src/libide/projects/ide-project-item.c
index 42c18efb4..2f0cbb981 100644
--- a/src/libide/projects/ide-project-item.c
+++ b/src/libide/projects/ide-project-item.c
@@ -144,7 +144,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 (dzl_set_weak_pointer (&priv->parent, parent))
+  if (g_set_weak_pointer (&priv->parent, parent))
     g_object_notify_by_pspec (G_OBJECT (item), properties [PROP_PARENT]);
 }
 
@@ -154,7 +154,7 @@ ide_project_item_finalize (GObject *object)
   IdeProjectItem *self = (IdeProjectItem *)object;
   IdeProjectItemPrivate *priv = ide_project_item_get_instance_private (self);
 
-  dzl_clear_weak_pointer (&priv->parent);
+  g_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 878f78953..0d966dde7 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);
-      dzl_clear_weak_pointer (&self->source_view);
+      g_clear_weak_pointer (&self->source_view);
     }
 
   if (self->operations_signals != NULL)
@@ -772,7 +772,7 @@ ide_cursor_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_IDE_SOURCE_VIEW:
-      dzl_set_weak_pointer (&self->source_view, g_value_get_object (value));
+      g_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 509faca02..6aa4424e0 100644
--- a/src/libide/sourceview/ide-line-change-gutter-renderer.c
+++ b/src/libide/sourceview/ide-line-change-gutter-renderer.c
@@ -91,7 +91,7 @@ disconnect_buffer (IdeLineChangeGutterRenderer *self)
     {
       g_signal_handler_disconnect (self->buffer, self->buffer_notify_style_scheme);
       self->buffer_notify_style_scheme = 0;
-      dzl_clear_weak_pointer (&self->buffer);
+      g_clear_weak_pointer (&self->buffer);
     }
 }
 
@@ -104,7 +104,7 @@ disconnect_view (IdeLineChangeGutterRenderer *self)
     {
       g_signal_handler_disconnect (self->text_view, self->text_view_notify_buffer);
       self->text_view_notify_buffer = 0;
-      dzl_clear_weak_pointer (&self->text_view);
+      g_clear_weak_pointer (&self->text_view);
     }
 }
 
@@ -195,7 +195,7 @@ connect_buffer (IdeLineChangeGutterRenderer *self)
 
   if (buffer)
     {
-      dzl_set_weak_pointer (&self->buffer, buffer);
+      g_set_weak_pointer (&self->buffer, buffer);
       self->buffer_notify_style_scheme = g_signal_connect (buffer,
                                                            "notify::style-scheme",
                                                            G_CALLBACK (notify_style_scheme_cb),
@@ -222,7 +222,7 @@ connect_view (IdeLineChangeGutterRenderer *self)
 
   if (view)
     {
-      dzl_set_weak_pointer (&self->text_view, view);
+      g_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 a31e22fa3..f5f99ec7a 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -5330,13 +5330,13 @@ ide_source_view_dispose (GObject *object)
   if (priv->hadj_animation)
     {
       dzl_animation_stop (priv->hadj_animation);
-      dzl_clear_weak_pointer (&priv->hadj_animation);
+      g_clear_weak_pointer (&priv->hadj_animation);
     }
 
   if (priv->vadj_animation)
     {
       dzl_animation_stop (priv->vadj_animation);
-      dzl_clear_weak_pointer (&priv->vadj_animation);
+      g_clear_weak_pointer (&priv->vadj_animation);
     }
 
   ide_source_view_clear_snippets (self);
@@ -7408,7 +7408,7 @@ ide_source_view_scroll_to_iter (IdeSourceView        *self,
       if (priv->hadj_animation != NULL)
         {
           dzl_animation_stop (priv->hadj_animation);
-          dzl_clear_weak_pointer (&priv->hadj_animation);
+          g_clear_weak_pointer (&priv->hadj_animation);
         }
 
       priv->hadj_animation =
@@ -7424,7 +7424,7 @@ ide_source_view_scroll_to_iter (IdeSourceView        *self,
       if (priv->vadj_animation != NULL)
         {
           dzl_animation_stop (priv->vadj_animation);
-          dzl_clear_weak_pointer (&priv->vadj_animation);
+          g_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 b4dd073dd..a05b5d9ca 100644
--- a/src/plugins/beautifier/gb-beautifier-editor-addin.c
+++ b/src/plugins/beautifier/gb-beautifier-editor-addin.c
@@ -427,7 +427,7 @@ gb_beautifier_editor_addin_load (IdeEditorAddin       *addin,
   g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
   g_assert (IDE_IS_EDITOR_PERSPECTIVE (editor));
 
-  dzl_set_weak_pointer (&self->editor, editor);
+  g_set_weak_pointer (&self->editor, editor);
   workbench = ide_widget_get_workbench (GTK_WIDGET (editor));
   self->context = ide_workbench_get_context (workbench);
   ide_object_set_context (IDE_OBJECT (self), self->context);
@@ -469,7 +469,7 @@ gb_beautifier_editor_addin_unload (IdeEditorAddin       *addin,
       g_clear_pointer (&self->entries, g_array_unref);
     }
 
-  dzl_clear_weak_pointer (&self->editor);
+  g_clear_weak_pointer (&self->editor);
   if (self->tmp_dir != NULL)
     {
       tmp_file = g_file_new_for_path (self->tmp_dir);
@@ -506,7 +506,7 @@ gb_beautifier_editor_addin_view_set (IdeEditorAddin *addin,
 
   if (view != NULL)
     {
-      dzl_set_weak_pointer (&self->current_view, view);
+      g_set_weak_pointer (&self->current_view, view);
       setup_view_cb (GTK_WIDGET (view), self);
     }
   else
diff --git a/src/plugins/clang/ide-clang-highlighter.c b/src/plugins/clang/ide-clang-highlighter.c
index 65e0e26a6..b48064bbd 100644
--- a/src/plugins/clang/ide-clang-highlighter.c
+++ b/src/plugins/clang/ide-clang-highlighter.c
@@ -270,7 +270,7 @@ ide_clang_highlighter_real_set_engine (IdeHighlighter     *highlighter,
 {
   IdeClangHighlighter *self = (IdeClangHighlighter *)highlighter;
 
-  dzl_set_weak_pointer (&self->engine, engine);
+  g_set_weak_pointer (&self->engine, engine);
 }
 
 static void
@@ -278,7 +278,7 @@ ide_clang_highlighter_finalize (GObject *object)
 {
   IdeClangHighlighter *self = (IdeClangHighlighter *)object;
 
-  dzl_clear_weak_pointer (&self->engine);
+  g_clear_weak_pointer (&self->engine);
 
   G_OBJECT_CLASS (ide_clang_highlighter_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 ccb5e9ce2..f78ef31f1 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 (dzl_set_weak_pointer (&self->buffer, buffer))
+  if (g_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;
 
-  dzl_clear_weak_pointer (&self->buffer);
+  g_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 cdc7ce7f3..e441395c3 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);
-          dzl_clear_weak_pointer (&self->panel);
+          g_clear_weak_pointer (&self->panel);
           self->palette_widget = NULL;
         }
 
       if (panel != NULL && GSTYLE_IS_COLOR_PANEL (panel))
         {
-          dzl_set_weak_pointer (&self->panel, panel);
+          g_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;
 
-  dzl_clear_weak_pointer (&self->panel);
+  g_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 854a49635..4bf169ccf 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));
 
-  dzl_set_weak_pointer (&self->workbench, workbench);
+  g_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");
-  dzl_clear_weak_pointer (&self->workbench);
+  g_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));
 
-  dzl_set_weak_pointer (&self->last_focus, widget);
+  g_set_weak_pointer (&self->last_focus, widget);
 }
 
 /**
@@ -629,12 +629,12 @@ gb_command_bar_finalize (GObject *object)
 {
   GbCommandBar *self = (GbCommandBar *)object;
 
-  dzl_clear_weak_pointer (&self->workbench);
+  g_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);
-  dzl_clear_weak_pointer (&self->last_focus);
+  g_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 0557d1ae3..c176605d7 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 (dzl_set_weak_pointer (&vim->active_widget, active_widget))
+  if (g_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);
 
-  dzl_clear_weak_pointer (&self->active_widget);
+  g_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 a857c49d9..cdfd863aa 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;
 
-  dzl_clear_weak_pointer (&self->widget);
+  g_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);
-      dzl_set_weak_pointer (&self->widget, widget);
+      g_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 610a51bf4..acc21471d 100644
--- a/src/plugins/ctags/ide-ctags-highlighter.c
+++ b/src/plugins/ctags/ide-ctags-highlighter.c
@@ -252,7 +252,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);
 
-  dzl_set_weak_pointer (&self->service, service);
+  g_set_weak_pointer (&self->service, service);
 
   ide_ctags_service_register_highlighter (service, self);
 }
@@ -265,7 +265,7 @@ ide_ctags_highlighter_finalize (GObject *object)
   if (self->service != NULL)
     {
       ide_ctags_service_unregister_highlighter (self->service, self);
-      dzl_clear_weak_pointer (&self->service);
+      g_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 a73929465..4049982fc 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;
 
-  dzl_clear_weak_pointer (&self->context);
+  g_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:
-      dzl_set_weak_pointer (&self->context, g_value_get_object (value));
+      g_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 6571d1bbf..040b20e04 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -250,7 +250,7 @@ install_info_free (InstallInfo *info)
                                             info);
     }
 
-  dzl_clear_weak_pointer (&info->self);
+  g_clear_weak_pointer (&info->self);
   g_clear_object (&info->monitor);
   g_clear_object (&info->installation);
 
@@ -269,7 +269,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);
-  dzl_set_weak_pointer (&info->self, self);
+  g_set_weak_pointer (&info->self, self);
 
   if (info->monitor != NULL)
     {
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c 
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 4051a8cfe..9bbdcfb7b 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -178,7 +178,7 @@ gbp_flatpak_runtime_provider_load (IdeRuntimeProvider *provider,
   g_assert (GBP_IS_FLATPAK_RUNTIME_PROVIDER (self));
   g_assert (IDE_IS_RUNTIME_MANAGER (manager));
 
-  dzl_set_weak_pointer (&self->manager, manager);
+  g_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);
 
@@ -226,7 +226,7 @@ gbp_flatpak_runtime_provider_unload (IdeRuntimeProvider *provider,
 
   g_clear_pointer (&self->runtimes, g_ptr_array_unref);
 
-  dzl_clear_weak_pointer (&self->manager);
+  g_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 4563dbadf..ebd586d95 100644
--- a/src/plugins/git/ide-git-buffer-change-monitor.c
+++ b/src/plugins/git/ide-git-buffer-change-monitor.c
@@ -502,7 +502,7 @@ ide_git_buffer_change_monitor_set_buffer (IdeBufferChangeMonitor *monitor,
   g_return_if_fail (IDE_IS_BUFFER (buffer));
   g_return_if_fail (!self->buffer);
 
-  dzl_set_weak_pointer (&self->buffer, buffer);
+  g_set_weak_pointer (&self->buffer, buffer);
 
   context = ide_object_get_context (IDE_OBJECT (self));
   vcs = ide_context_get_vcs (context);
@@ -829,7 +829,7 @@ ide_git_buffer_change_monitor_dispose (GObject *object)
 
   dzl_clear_source (&self->changed_timeout);
 
-  dzl_clear_weak_pointer (&self->buffer);
+  g_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 ba9271e9d..24f59988a 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))
     {
-      dzl_clear_weak_pointer (&self->animation);
+      g_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);
-  dzl_set_weak_pointer (&self->animation, animation);
+  g_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 56b62a227..f81dc9220 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));
 
-  dzl_set_weak_pointer (&self->stack_addin, GBP_HISTORY_LAYOUT_STACK_ADDIN (stack_addin));
+  g_set_weak_pointer (&self->stack_addin, GBP_HISTORY_LAYOUT_STACK_ADDIN (stack_addin));
 
   IDE_EXIT;
 }
@@ -265,7 +265,7 @@ gbp_history_editor_view_addin_unload (IdeEditorViewAddin *addin,
                                         G_CALLBACK (gbp_history_editor_view_addin_delete_range),
                                         self);
 
-  dzl_clear_weak_pointer (&self->stack_addin);
+  g_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 71c8a2f67..d69f92f84 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;
 
-  dzl_clear_weak_pointer (&self->context);
+  g_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));
-  dzl_set_weak_pointer (&item->context, context);
+  g_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 e54f9a2db..ee53a2683 100644
--- a/src/plugins/sysmon/gb-sysmon-addin.c
+++ b/src/plugins/sysmon/gb-sysmon-addin.c
@@ -57,7 +57,7 @@ gb_sysmon_addin_load (IdeWorkbenchAddin *addin,
                         "expand", TRUE,
                         "visible", TRUE,
                         NULL);
-  dzl_set_weak_pointer (&self->panel, panel);
+  g_set_weak_pointer (&self->panel, panel);
   gtk_container_add (GTK_CONTAINER (pane), GTK_WIDGET (panel));
 }
 
@@ -73,7 +73,7 @@ gb_sysmon_addin_unload (IdeWorkbenchAddin *addin,
   if (self->panel != NULL)
     {
       gtk_widget_destroy (self->panel);
-      dzl_clear_weak_pointer (&self->panel);
+      g_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 500c32c7f..b18bd9fb7 100644
--- a/src/plugins/terminal/gb-terminal-workbench-addin.c
+++ b/src/plugins/terminal/gb-terminal-workbench-addin.c
@@ -199,7 +199,7 @@ on_run_manager_run (GbTerminalWorkbenchAddin *self,
                            "pty", pty,
                            "visible", TRUE,
                            NULL);
-      dzl_set_weak_pointer (&self->run_terminal, view);
+      g_set_weak_pointer (&self->run_terminal, view);
 
       panel = g_object_new (DZL_TYPE_DOCK_WIDGET,
                             "child", self->run_terminal,
@@ -208,7 +208,7 @@ on_run_manager_run (GbTerminalWorkbenchAddin *self,
                             "title", _("Application Output"),
                             "visible", TRUE,
                             NULL);
-      dzl_set_weak_pointer (&self->run_panel, panel);
+      g_set_weak_pointer (&self->run_panel, panel);
 
       perspective = ide_workbench_get_perspective_by_name (self->workbench, "editor");
       g_assert (IDE_IS_EDITOR_PERSPECTIVE (perspective));
@@ -335,7 +335,7 @@ gb_terminal_workbench_addin_load (IdeWorkbenchAddin *addin,
 
   context = ide_workbench_get_context (workbench);
 
-  dzl_set_weak_pointer (&self->workbench, workbench);
+  g_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);
@@ -407,13 +407,13 @@ gb_terminal_workbench_addin_unload (IdeWorkbenchAddin *addin,
   if (self->panel_dock_widget != NULL)
     {
       gtk_widget_destroy (self->panel_dock_widget);
-      dzl_clear_weak_pointer (&self->panel_dock_widget);
+      g_clear_weak_pointer (&self->panel_dock_widget);
     }
 
   if (self->run_panel != NULL)
     {
       gtk_widget_destroy (self->run_panel);
-      dzl_clear_weak_pointer (&self->run_panel);
+      g_clear_weak_pointer (&self->run_panel);
     }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]