callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 563985 – jpg save dialog: "cancel" is treated like "commit" for

Browse Source 
2008-12-28  Sven Neumann  <sven@gimp.org>

	Bug 563985 – jpg save dialog: "cancel" is treated like "commit"
	for settings

	* plug-ins/file-jpeg/jpeg.c (run): only attach the comment and
	settings to the image if the save was successful.


svn path=/trunk/; revision=27843
This commit is contained in:
Sven Neumann
2008-12-28 02:10:32 +00:00
committed by Sven Neumann
parent 4ce9631b46
commit 28237630eb
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-12-28 Sven Neumann <sven@gimp.org>
Bug 563985 – jpg save dialog: "cancel" is treated like "commit"
for settings
* plug-ins/file-jpeg/jpeg.c (run): only attach the comment and
settings to the image if the save was successful.
2008-12-28 Sven Neumann <sven@gimp.org> 2008-12-28 Sven Neumann <sven@gimp.org>
Bug 565362 – the previously opened file is not suggested if gimp Bug 565362 – the previously opened file is not suggested if gimp

37
plug-ins/file-jpeg/jpeg.c
View File

@ -498,28 +498,31 @@ run (const gchar *name,
gimp_display_delete (display_ID); gimp_display_delete (display_ID);
else else
gimp_image_delete (image_ID); gimp_image_delete (image_ID);
} }
/* pw - now we need to change the defaults to be whatever if (status == GIMP_PDB_SUCCESS)
* was used to save this image. Dump the old parasites
* and add new ones. */
gimp_image_parasite_detach (orig_image_ID, "gimp-comment");
if (image_comment && strlen (image_comment))
{ {
parasite = gimp_parasite_new ("gimp-comment", /* pw - now we need to change the defaults to be whatever
GIMP_PARASITE_PERSISTENT, * was used to save this image. Dump the old parasites
strlen (image_comment) + 1, * and add new ones. */
image_comment);
gimp_image_parasite_detach (orig_image_ID, "gimp-comment");
if (image_comment && strlen (image_comment))
{
parasite = gimp_parasite_new ("gimp-comment",
GIMP_PARASITE_PERSISTENT,
strlen (image_comment) + 1,
image_comment);
gimp_image_parasite_attach (orig_image_ID, parasite);
gimp_parasite_free (parasite);
}
gimp_image_parasite_detach (orig_image_ID, "jpeg-save-options");
parasite = gimp_parasite_new ("jpeg-save-options",
0, sizeof (jsvals), &jsvals);
gimp_image_parasite_attach (orig_image_ID, parasite); gimp_image_parasite_attach (orig_image_ID, parasite);
gimp_parasite_free (parasite); gimp_parasite_free (parasite);
} }
gimp_image_parasite_detach (orig_image_ID, "jpeg-save-options");
parasite = gimp_parasite_new ("jpeg-save-options",
0, sizeof (jsvals), &jsvals);
gimp_image_parasite_attach (orig_image_ID, parasite);
gimp_parasite_free (parasite);
} }
else else
{ {