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

app: fix GimpTaggedContainer's base class 

And make it use the sort_func from the src_container which must
now be a GimpList (which is likely temporary).
This commit is contained in:
Michael Natterer 2011-03-23 21:51:56 +01:00
parent b49fdd4fd0
commit 014a333d27
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/core/gimptaggedcontainer.c
View File

@ -267,15 +267,16 @@ gimp_tagged_container_get_memsize (GimpObject *object,
* Return value: a new #GimpTaggedContainer object.
**/
GimpContainer *
gimp_tagged_container_new (GimpContainer *src_container,
GCompareFunc sort_func)
gimp_tagged_container_new (GimpContainer *src_container)
{
GimpTaggedContainer *tagged_container;
GType children_type;
GType children_type;
GCompareFunc sort_func;
g_return_val_if_fail (GIMP_IS_CONTAINER (src_container), NULL);
g_return_val_if_fail (GIMP_IS_LIST (src_container), NULL);
children_type = gimp_container_get_children_type (src_container);
sort_func = GIMP_LIST (src_container)->sort_func;
tagged_container = g_object_new (GIMP_TYPE_TAGGED_CONTAINER,
"sort-func", sort_func,

5
app/core/gimptaggedcontainer.h
View File

@ -47,7 +47,7 @@ struct _GimpTaggedContainer
struct _GimpTaggedContainerClass
{
GimpContainerClass parent_class;
GimpListClass parent_class;
void (* tag_count_changed) (GimpTaggedContainer *container,
gint count);
@ -56,8 +56,7 @@ struct _GimpTaggedContainerClass
GType gimp_tagged_container_get_type (void) G_GNUC_CONST;
GimpContainer * gimp_tagged_container_new (GimpContainer *src_container,
GCompareFunc sort_func);
GimpContainer * gimp_tagged_container_new (GimpContainer *src_container);
void gimp_tagged_container_set_filter (GimpTaggedContainer *tagged_container,
GList *tags);

3
app/widgets/gimpdatafactoryview.c
View File

@ -242,8 +242,7 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
factory_view->priv->factory = factory;
factory_view->priv->tagged_container =
gimp_tagged_container_new (gimp_data_factory_get_container (factory),
(GCompareFunc) gimp_data_compare);
gimp_tagged_container_new (gimp_data_factory_get_container (factory));
if (! gimp_container_editor_construct (GIMP_CONTAINER_EDITOR (factory_view),
view_type,