[gimp/metadata-wip-rebased: 6/20] plug-ins: consider GIMP_RUN_WITH_LAST_VALS being an interactive run
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/metadata-wip-rebased: 6/20] plug-ins: consider GIMP_RUN_WITH_LAST_VALS being an interactive run
- Date: Thu, 24 Oct 2013 21:31:32 +0000 (UTC)
commit 8421e57011c58f6a200a5461927738f1899a63a2
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 22 20:53:02 2013 +0200
plug-ins: consider GIMP_RUN_WITH_LAST_VALS being an interactive run
plug-ins/common/file-png.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index c33a16a..60f65dc 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -420,6 +420,8 @@ run (const gchar *name,
GimpExportReturn export = GIMP_EXPORT_CANCEL;
GError *error = NULL;
+ run_mode = param[0].data.d_int32;
+
INIT_I18N ();
gegl_init (NULL, NULL);
@@ -431,20 +433,29 @@ run (const gchar *name,
if (strcmp (name, LOAD_PROC) == 0)
{
- run_mode = param[0].data.d_int32;
+ gboolean interactive;
- if (run_mode == GIMP_RUN_INTERACTIVE)
- gimp_ui_init (PLUG_IN_BINARY, FALSE);
+ switch (run_mode)
+ {
+ case GIMP_RUN_INTERACTIVE:
+ case GIMP_RUN_WITH_LAST_VALS:
+ gimp_ui_init (PLUG_IN_BINARY, FALSE);
+ interactive = TRUE;
+ break;
+ default:
+ interactive = FALSE;
+ break;
+ }
image_ID = load_image (param[1].data.d_string,
- run_mode == GIMP_RUN_INTERACTIVE, &error);
+ interactive, &error);
if (image_ID != -1)
{
GFile *file = g_file_new_for_path (param[1].data.d_string);
gimp_image_metadata_load (image_ID, "image/png", file,
- run_mode == GIMP_RUN_INTERACTIVE);
+ interactive);
g_object_unref (file);
@@ -463,7 +474,6 @@ run (const gchar *name,
{
gboolean alpha;
- run_mode = param[0].data.d_int32;
image_ID = orig_image_ID = param[1].data.d_int32;
drawable_ID = param[2].data.d_int32;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]