[gimp] app: clean up last commit
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: clean up last commit
- Date: Tue, 5 Mar 2019 21:43:20 +0000 (UTC)
commit b0de51b6bfbebd1fa798fa7faab4d1ad64bc5e86
Author: Ell <ell_se yahoo com>
Date: Tue Mar 5 16:39:07 2019 -0500
app: clean up last commit
Remove gimp_item_tree_clear(), added in last commit, and move its
code to gimp_item_tree_dispose(). Likewise, in
gimp_image_dispose(), use g_object_run_dispose() on the image item-
trees, instead of gimp_item_tree_clear().
app/core/gimpimage.c | 6 +++---
app/core/gimpitemtree.c | 29 +++++++++--------------------
app/core/gimpitemtree.h | 2 --
3 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 28aa0c1f4e..b870dc7b6a 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -1032,9 +1032,9 @@ gimp_image_dispose (GObject *object)
gimp_image_channel_remove,
image);
- gimp_item_tree_clear (private->layers);
- gimp_item_tree_clear (private->channels);
- gimp_item_tree_clear (private->vectors);
+ g_object_run_dispose (G_OBJECT (private->layers));
+ g_object_run_dispose (G_OBJECT (private->channels));
+ g_object_run_dispose (G_OBJECT (private->vectors));
G_OBJECT_CLASS (parent_class)->dispose (object);
}
diff --git a/app/core/gimpitemtree.c b/app/core/gimpitemtree.c
index 2e45d6da57..7746afa08c 100644
--- a/app/core/gimpitemtree.c
+++ b/app/core/gimpitemtree.c
@@ -163,9 +163,16 @@ gimp_item_tree_constructed (GObject *object)
static void
gimp_item_tree_dispose (GObject *object)
{
- GimpItemTree *tree = GIMP_ITEM_TREE (object);
+ GimpItemTree *tree = GIMP_ITEM_TREE (object);
+ GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
- gimp_item_tree_clear (tree);
+ gimp_item_tree_set_active_item (tree, NULL);
+
+ gimp_container_foreach (tree->container,
+ (GFunc) gimp_item_removed, NULL);
+
+ gimp_container_clear (tree->container);
+ g_hash_table_remove_all (private->name_hash);
G_OBJECT_CLASS (parent_class)->dispose (object);
}
@@ -396,24 +403,6 @@ gimp_item_tree_get_insert_pos (GimpItemTree *tree,
return TRUE;
}
-void
-gimp_item_tree_clear (GimpItemTree *tree)
-{
- GimpItemTreePrivate *private;
-
- g_return_if_fail (GIMP_IS_ITEM_TREE (tree));
-
- private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
-
- gimp_item_tree_set_active_item (tree, NULL);
-
- gimp_container_foreach (tree->container,
- (GFunc) gimp_item_removed, NULL);
-
- gimp_container_clear (tree->container);
- g_hash_table_remove_all (private->name_hash);
-}
-
void
gimp_item_tree_add_item (GimpItemTree *tree,
GimpItem *item,
diff --git a/app/core/gimpitemtree.h b/app/core/gimpitemtree.h
index 3b9b84a6eb..4d3c6eaf1f 100644
--- a/app/core/gimpitemtree.h
+++ b/app/core/gimpitemtree.h
@@ -64,8 +64,6 @@ gboolean gimp_item_tree_get_insert_pos (GimpItemTree *tree,
GimpItem **parent,
gint *position);
-void gimp_item_tree_clear (GimpItemTree *tree);
-
void gimp_item_tree_add_item (GimpItemTree *tree,
GimpItem *item,
GimpItem *parent,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]