[gnome-builder/wip/gtk4-port] plugins/project-tree: undazzle



commit 47c1c1329e7ea47d4f205810f34f64c654eafb07
Author: Christian Hergert <chergert redhat com>
Date:   Thu Mar 31 02:30:39 2022 -0700

    plugins/project-tree: undazzle

 src/plugins/project-tree/gbp-new-file-popover.c        |  4 ++--
 .../project-tree/gbp-project-tree-pane-actions.c       | 18 +++++++++---------
 src/plugins/project-tree/gbp-project-tree-pane.c       |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/plugins/project-tree/gbp-new-file-popover.c b/src/plugins/project-tree/gbp-new-file-popover.c
index 7f61207dc..5b29639a1 100644
--- a/src/plugins/project-tree/gbp-new-file-popover.c
+++ b/src/plugins/project-tree/gbp-new-file-popover.c
@@ -67,7 +67,7 @@ gbp_new_file_popover_button_clicked (GbpNewFilePopover *self,
     return;
 
   path = gtk_entry_get_text (self->entry);
-  if (dzl_str_empty0 (path))
+  if (ide_str_empty0 (path))
     return;
 
   stripped = g_strstrip (g_strdup (path));
@@ -180,7 +180,7 @@ gbp_new_file_popover_entry_changed (GbpNewFilePopover *self,
    * consistents with the final behavior (creating the file). */
   stripped = g_strstrip(g_strdup (gtk_entry_get_text (entry)));
 
-  gtk_widget_set_sensitive (GTK_WIDGET (self->button), !dzl_str_empty0 (stripped));
+  gtk_widget_set_sensitive (GTK_WIDGET (self->button), !ide_str_empty0 (stripped));
 
   gbp_new_file_popover_check_exists (self, self->directory, stripped);
 }
diff --git a/src/plugins/project-tree/gbp-project-tree-pane-actions.c 
b/src/plugins/project-tree/gbp-project-tree-pane-actions.c
index a93bae7ce..68271e337 100644
--- a/src/plugins/project-tree/gbp-project-tree-pane-actions.c
+++ b/src/plugins/project-tree/gbp-project-tree-pane-actions.c
@@ -437,7 +437,7 @@ DEFINE_ACTION_HANDLER (open_containing_folder, {
     return;
 
   file = ide_project_file_ref_file (project_file);
-  dzl_file_manager_show (file, NULL);
+  ide_file_manager_show (file, NULL);
 });
 
 DEFINE_ACTION_HANDLER (open_with_hint, {
@@ -606,28 +606,28 @@ _gbp_project_tree_pane_update_actions (GbpProjectTreePane *self)
         }
     }
 
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "new-file",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "new-file",
                              "enabled", is_file,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "new-folder",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "new-folder",
                              "enabled", is_file,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "trash",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "trash",
                              "enabled", is_file,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "rename",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "rename",
                              "enabled", is_file,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open",
                              "enabled", is_file && !is_dir,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open-with-hint",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open-with-hint",
                              "enabled", is_file,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open-containing-folder",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open-containing-folder",
                              "enabled", is_file,
                              NULL);
-  dzl_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open-in-terminal",
+  ide_gtk_widget_action_set (GTK_WIDGET (self->tree), "project-tree", "open-in-terminal",
                              "enabled", is_file,
                              NULL);
 }
diff --git a/src/plugins/project-tree/gbp-project-tree-pane.c 
b/src/plugins/project-tree/gbp-project-tree-pane.c
index 906b5c74e..3ad51a541 100644
--- a/src/plugins/project-tree/gbp-project-tree-pane.c
+++ b/src/plugins/project-tree/gbp-project-tree-pane.c
@@ -48,7 +48,7 @@ gbp_project_tree_pane_init (GbpProjectTreePane *self)
   gtk_widget_init_template (GTK_WIDGET (self));
 
   app = IDE_APPLICATION_DEFAULT;
-  menu = dzl_application_get_menu_by_id (DZL_APPLICATION (app), "project-tree-menu");
+  menu = ide_application_get_menu_by_id (IDE_APPLICATION (app), "project-tree-menu");
   ide_tree_set_context_menu (self->tree, menu);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->tree));


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