dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: various fixes to last commits

This commit is contained in:
Ell 2020-01-30 10:45:41 +02:00
parent fa53e1433f
commit bae9f2d880
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/tools/gimp-tools.c
View File

@ -503,7 +503,9 @@ gimp_tools_deserialize (Gimp *gimp,
gimp_container_freeze (container);
/* make sure the various GimpToolItem types are registered */
g_type_class_unref (g_type_class_ref (GIMP_TYPE_TOOL_GROUP));
g_type_class_unref (g_type_class_ref (GIMP_TYPE_TOOL_INFO));
gimp_container_clear (container);
@ -767,10 +769,20 @@ gimp_tools_copy_structure (Gimp *gimp,
dest_tool_item = GIMP_TOOL_ITEM (
gimp_get_tool_info (gimp, gimp_object_get_name (src_tool_item)));
if (dest_tool_item && GIMP_TOOL_INFO (dest_tool_item)->hidden)
dest_tool_item = NULL;
else if (tools)
g_hash_table_add (tools, dest_tool_item);
if (dest_tool_item)
{
if (! GIMP_TOOL_INFO (dest_tool_item)->hidden)
{
g_object_ref (dest_tool_item);
if (tools)
g_hash_table_add (tools, dest_tool_item);
}
else
{
dest_tool_item = NULL;
}
}
}
if (dest_tool_item)
@ -781,6 +793,8 @@ gimp_tools_copy_structure (Gimp *gimp,
gimp_container_add (dest_container,
GIMP_OBJECT (dest_tool_item));
g_object_unref (dest_tool_item);
}
}
}

3
app/widgets/gimptoolbutton.c
View File

@ -194,8 +194,7 @@ gimp_tool_button_class_init (GimpToolButtonClass *klass)
g_param_spec_object ("tool-item",
NULL, NULL,
GIMP_TYPE_TOOL_ITEM,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GIMP_PARAM_READWRITE));
}
static void