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

removed the code which sets the new image on all contexts where the old 

2004-10-06  Michael Natterer  <mitch@gimp.org>

	* app/actions/file-commands.c (file_revert_confirm_callback):
	removed the code which sets the new image on all contexts where
	the old image was set...

	* app/display/gimpdisplay-foreach.c (gimp_displays_reconnect):
	...and added it here so it happens for all calls of this function,
	also from the PDB. Fixes bug #154638.
This commit is contained in:
Michael Natterer 2004-10-06 09:28:35 +00:00 committed by Michael Natterer
parent 449a1c457c
commit a1ff75dedb
3 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-10-06 Michael Natterer <mitch@gimp.org>
* app/actions/file-commands.c (file_revert_confirm_callback):
removed the code which sets the new image on all contexts where
the old image was set...
* app/display/gimpdisplay-foreach.c (gimp_displays_reconnect):
...and added it here so it happens for all calls of this function,
also from the PDB. Fixes bug #154638.
2004-10-06 Sven Neumann <sven@gimp.org>
* libgimp/gimp.def: updated.

20
app/actions/file-commands.c
View File

@ -30,7 +30,6 @@
#include "core/gimp.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpimage.h"
#include "core/gimpprogress.h"
#include "core/gimptemplate.h"
@ -474,28 +473,9 @@ file_revert_confirm_callback (GtkWidget *widget,
if (new_gimage)
{
GList *contexts = NULL;
GList *list;
/* remember which contexts refer to old_gimage */
for (list = gimp->context_list; list; list = g_list_next (list))
{
GimpContext *context = list->data;
if (gimp_context_get_image (context) == old_gimage)
contexts = g_list_prepend (contexts, list->data);
}
gimp_displays_reconnect (gimp, old_gimage, new_gimage);
gimp_image_flush (new_gimage);
/* set the new_gimage on the remembered contexts (in reverse
* order, since older contexts are usually the parents of
* newer ones)
*/
g_list_foreach (contexts, (GFunc) gimp_context_set_image, new_gimage);
g_list_free (contexts);
/* the displays own the image now */
g_object_unref (new_gimage);
}

39
app/display/gimpdisplay-foreach.c
View File

@ -23,6 +23,7 @@
#include "display-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpimage.h"
#include "core/gimplist.h"
@ -107,8 +108,6 @@ gimp_displays_get_dirty_images (Gimp *gimp)
void
gimp_displays_delete (Gimp *gimp)
{
GimpDisplay *gdisp;
g_return_if_fail (GIMP_IS_GIMP (gimp));
/* this removes the GimpDisplay from the list, so do a while loop
@ -116,7 +115,7 @@ gimp_displays_delete (Gimp *gimp)
*/
while (GIMP_LIST (gimp->displays)->list)
{
gdisp = (GimpDisplay *) GIMP_LIST (gimp->displays)->list->data;
GimpDisplay *gdisp = GIMP_LIST (gimp->displays)->list->data;
gimp_display_delete (gdisp);
}
@ -127,29 +126,44 @@ gimp_displays_reconnect (Gimp *gimp,
GimpImage *old,
GimpImage *new)
{
GList *list;
GimpDisplay *gdisp;
GList *contexts = NULL;
GList *list;
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (GIMP_IS_IMAGE (old));
g_return_if_fail (GIMP_IS_IMAGE (new));
/* remember which contexts refer to old_gimage */
for (list = gimp->context_list; list; list = g_list_next (list))
{
GimpContext *context = list->data;
if (gimp_context_get_image (context) == old)
contexts = g_list_prepend (contexts, list->data);
}
for (list = GIMP_LIST (gimp->displays)->list;
list;
list = g_list_next (list))
{
gdisp = list->data;
GimpDisplay *gdisp = list->data;
if (gdisp->gimage == old)
gimp_display_reconnect (gdisp, new);
}
/* set the new_gimage on the remembered contexts (in reverse
* order, since older contexts are usually the parents of
* newer ones)
*/
g_list_foreach (contexts, (GFunc) gimp_context_set_image, new);
g_list_free (contexts);
}
void
gimp_displays_set_busy (Gimp *gimp)
{
GList *list;
GimpDisplayShell *shell;
GList *list;
g_return_if_fail (GIMP_IS_GIMP (gimp));
@ -157,7 +171,8 @@ gimp_displays_set_busy (Gimp *gimp)
list;
list = g_list_next (list))
{
shell = GIMP_DISPLAY_SHELL (GIMP_DISPLAY (list->data)->shell);
GimpDisplayShell *shell =
GIMP_DISPLAY_SHELL (GIMP_DISPLAY (list->data)->shell);
gimp_display_shell_set_override_cursor (shell, GDK_WATCH);
}
@ -166,8 +181,7 @@ gimp_displays_set_busy (Gimp *gimp)
void
gimp_displays_unset_busy (Gimp *gimp)
{
GList *list;
GimpDisplayShell *shell;
GList *list;
g_return_if_fail (GIMP_IS_GIMP (gimp));
@ -175,7 +189,8 @@ gimp_displays_unset_busy (Gimp *gimp)
list;
list = g_list_next (list))
{
shell = GIMP_DISPLAY_SHELL (GIMP_DISPLAY (list->data)->shell);
GimpDisplayShell *shell =
GIMP_DISPLAY_SHELL (GIMP_DISPLAY (list->data)->shell);
gimp_display_shell_unset_override_cursor (shell);
}