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

don't use the image container as display container. 

2005-04-13  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpimagedock.c (gimp_image_dock_image_changed):
	don't use the image container as display container.
This commit is contained in:
Michael Natterer 2005-04-12 23:31:47 +00:00 committed by Michael Natterer
parent c3807c6a04
commit bf1b9651f8
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-13 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpimagedock.c (gimp_image_dock_image_changed):
don't use the image container as display container.
2005-04-13 Sven Neumann <sven@gimp.org>
* app/core/gimpdatafactory.[ch]: added gimp_data_factory_refresh().

12
app/widgets/gimpimagedock.c
View File

@ -587,11 +587,13 @@ gimp_image_dock_image_changed (GimpContext *context,
GimpDock *dock)
{
GimpImageDock *image_dock = GIMP_IMAGE_DOCK (dock);
GimpContainer *container = image_dock->image_container;
GimpContainer *image_container = image_dock->image_container;
GimpContainer *display_container = image_dock->display_container;
if (gimage == NULL && ! gimp_container_is_empty (container))
if (gimage == NULL && ! gimp_container_is_empty (image_container))
{
gimage = GIMP_IMAGE (gimp_container_get_child_by_index (container, 0));
gimage = GIMP_IMAGE (gimp_container_get_child_by_index (image_container,
0));
if (gimage)
{
@ -606,7 +608,7 @@ gimp_image_dock_image_changed (GimpContext *context,
g_signal_stop_emission_by_name (context, "image_changed");
}
}
else if (gimage != NULL && ! gimp_container_is_empty (container))
else if (gimage != NULL && ! gimp_container_is_empty (display_container))
{
GimpObject *gdisp;
GimpImage *gdisp_gimage;
@ -631,7 +633,7 @@ gimp_image_dock_image_changed (GimpContext *context,
{
GList *list;
for (list = GIMP_LIST (container)->list;
for (list = GIMP_LIST (display_container)->list;
list;
list = g_list_next (list))
{

12
app/widgets/gimpmenudock.c
View File

@ -587,11 +587,13 @@ gimp_image_dock_image_changed (GimpContext *context,
GimpDock *dock)
{
GimpImageDock *image_dock = GIMP_IMAGE_DOCK (dock);
GimpContainer *container = image_dock->image_container;
GimpContainer *image_container = image_dock->image_container;
GimpContainer *display_container = image_dock->display_container;
if (gimage == NULL && ! gimp_container_is_empty (container))
if (gimage == NULL && ! gimp_container_is_empty (image_container))
{
gimage = GIMP_IMAGE (gimp_container_get_child_by_index (container, 0));
gimage = GIMP_IMAGE (gimp_container_get_child_by_index (image_container,
0));
if (gimage)
{
@ -606,7 +608,7 @@ gimp_image_dock_image_changed (GimpContext *context,
g_signal_stop_emission_by_name (context, "image_changed");
}
}
else if (gimage != NULL && ! gimp_container_is_empty (container))
else if (gimage != NULL && ! gimp_container_is_empty (display_container))
{
GimpObject *gdisp;
GimpImage *gdisp_gimage;
@ -631,7 +633,7 @@ gimp_image_dock_image_changed (GimpContext *context,
{
GList *list;
for (list = GIMP_LIST (container)->list;
for (list = GIMP_LIST (display_container)->list;
list;
list = g_list_next (list))
{