app: add an "interactive" boolean inside gimp_export_image()

instead of using "format_name", which is confusing, and file plug-ins
will soon pass their format name again.
This commit is contained in:
Michael Natterer 2013-11-10 00:02:11 +01:00
parent ce6b4ca958
commit 206df00266
1 changed files with 6 additions and 2 deletions

View File

@ -694,6 +694,7 @@ gimp_export_image (gint32 *image_ID,
gint32 i;
gint32 n_layers;
gint32 *layers;
gboolean interactive = FALSE;
gboolean added_flatten = FALSE;
gboolean has_layer_masks = FALSE;
gboolean background_has_alpha = TRUE;
@ -714,8 +715,11 @@ gimp_export_image (gint32 *image_ID,
if (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS)
capabilities |= GIMP_EXPORT_CAN_HANDLE_ALPHA;
if (FALSE /* format_name */)
interactive = TRUE;
/* ask for confirmation if the user is not saving a layer (see bug #51114) */
if (format_name &&
if (interactive &&
! gimp_item_is_layer (*drawable_ID) &&
! (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS))
{
@ -918,7 +922,7 @@ gimp_export_image (gint32 *image_ID,
{
actions = g_slist_reverse (actions);
if (format_name)
if (interactive)
retval = export_dialog (actions, format_name);
else
retval = GIMP_EXPORT_EXPORT;