Commit 49dd42f6 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/plug-in/plug-in-message.c app/plug-in/plug-in-run.c (plug_in_temp_run)

2004-08-11  Michael Natterer  <mitch@gimp.org>

	* app/plug-in/plug-in-message.c
	* app/plug-in/plug-in-run.c (plug_in_temp_run)
	* libgimp/gimp.c (gimp_temp_proc_run): removed ENABLE_TEMP_RETURN
	#define and all code which was in #ifndef ENABLE_TEMP_RETURN.
parent ca30f738
2004-08-11 Michael Natterer <mitch@gimp.org>
* app/plug-in/plug-in-message.c
* app/plug-in/plug-in-run.c (plug_in_temp_run)
* libgimp/gimp.c (gimp_temp_proc_run): removed ENABLE_TEMP_RETURN
#define and all code which was in #ifndef ENABLE_TEMP_RETURN.
2004-08-11 Michael Natterer <mitch@gimp.org>
* app/core/gimp-gui.[ch]: added "display_ID" to gimp_new_progress().
......
......@@ -42,9 +42,6 @@
#include "plug-in-shm.h"
#define ENABLE_TEMP_RETURN 1
typedef struct _PlugInBlocked PlugInBlocked;
struct _PlugInBlocked
......@@ -65,10 +62,8 @@ static void plug_in_handle_proc_return_priv (PlugIn *plug_in,
GPProcReturn *proc_return);
static void plug_in_handle_proc_return (PlugIn *plug_in,
GPProcReturn *proc_return);
#ifdef ENABLE_TEMP_RETURN
static void plug_in_handle_temp_proc_return (PlugIn *plug_in,
GPProcReturn *proc_return);
#endif
static void plug_in_handle_proc_install (PlugIn *plug_in,
GPProcInstall *proc_install);
static void plug_in_handle_proc_uninstall (PlugIn *plug_in,
......@@ -139,15 +134,7 @@ plug_in_handle_message (PlugIn *plug_in,
break;
case GP_TEMP_PROC_RETURN:
#ifdef ENABLE_TEMP_RETURN
plug_in_handle_temp_proc_return (plug_in, msg->data);
#else
g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RETURN message (should not happen)",
gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE);
#endif
break;
case GP_PROC_INSTALL:
......@@ -505,7 +492,6 @@ plug_in_handle_proc_return (PlugIn *plug_in,
plug_in_close (plug_in, FALSE);
}
#ifdef ENABLE_TEMP_RETURN
static void
plug_in_handle_temp_proc_return (PlugIn *plug_in,
GPProcReturn *proc_return)
......@@ -526,7 +512,6 @@ plug_in_handle_temp_proc_return (PlugIn *plug_in,
plug_in_close (plug_in, TRUE);
}
}
#endif
static void
plug_in_handle_proc_install (PlugIn *plug_in,
......
......@@ -225,8 +225,6 @@ plug_in_repeat (Gimp *gimp,
/* private functions */
#define ENABLE_TEMP_RETURN 1
static Argument *
plug_in_temp_run (ProcRecord *proc_rec,
GimpProgress *progress,
......@@ -264,13 +262,9 @@ plug_in_temp_run (ProcRecord *proc_rec,
plug_in_ref (plug_in);
#ifdef ENABLE_TEMP_RETURN
plug_in_main_loop (plug_in);
return_vals = plug_in_get_return_vals (plug_in, proc_rec);
#else
return_vals = procedural_db_return_args (proc_rec, TRUE);
#endif
plug_in->temp_proc_recs = g_list_remove (plug_in->temp_proc_recs,
proc_rec);
......
......@@ -225,8 +225,6 @@ plug_in_repeat (Gimp *gimp,
/* private functions */
#define ENABLE_TEMP_RETURN 1
static Argument *
plug_in_temp_run (ProcRecord *proc_rec,
GimpProgress *progress,
......@@ -264,13 +262,9 @@ plug_in_temp_run (ProcRecord *proc_rec,
plug_in_ref (plug_in);
#ifdef ENABLE_TEMP_RETURN
plug_in_main_loop (plug_in);
return_vals = plug_in_get_return_vals (plug_in, proc_rec);
#else
return_vals = procedural_db_return_args (proc_rec, TRUE);
#endif
plug_in->temp_proc_recs = g_list_remove (plug_in->temp_proc_recs,
proc_rec);
......
......@@ -42,9 +42,6 @@
#include "plug-in-shm.h"
#define ENABLE_TEMP_RETURN 1
typedef struct _PlugInBlocked PlugInBlocked;
struct _PlugInBlocked
......@@ -65,10 +62,8 @@ static void plug_in_handle_proc_return_priv (PlugIn *plug_in,
GPProcReturn *proc_return);
static void plug_in_handle_proc_return (PlugIn *plug_in,
GPProcReturn *proc_return);
#ifdef ENABLE_TEMP_RETURN
static void plug_in_handle_temp_proc_return (PlugIn *plug_in,
GPProcReturn *proc_return);
#endif
static void plug_in_handle_proc_install (PlugIn *plug_in,
GPProcInstall *proc_install);
static void plug_in_handle_proc_uninstall (PlugIn *plug_in,
......@@ -139,15 +134,7 @@ plug_in_handle_message (PlugIn *plug_in,
break;
case GP_TEMP_PROC_RETURN:
#ifdef ENABLE_TEMP_RETURN
plug_in_handle_temp_proc_return (plug_in, msg->data);
#else
g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RETURN message (should not happen)",
gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE);
#endif
break;
case GP_PROC_INSTALL:
......@@ -505,7 +492,6 @@ plug_in_handle_proc_return (PlugIn *plug_in,
plug_in_close (plug_in, FALSE);
}
#ifdef ENABLE_TEMP_RETURN
static void
plug_in_handle_temp_proc_return (PlugIn *plug_in,
GPProcReturn *proc_return)
......@@ -526,7 +512,6 @@ plug_in_handle_temp_proc_return (PlugIn *plug_in,
plug_in_close (plug_in, TRUE);
}
}
#endif
static void
plug_in_handle_proc_install (PlugIn *plug_in,
......
......@@ -225,8 +225,6 @@ plug_in_repeat (Gimp *gimp,
/* private functions */
#define ENABLE_TEMP_RETURN 1
static Argument *
plug_in_temp_run (ProcRecord *proc_rec,
GimpProgress *progress,
......@@ -264,13 +262,9 @@ plug_in_temp_run (ProcRecord *proc_rec,
plug_in_ref (plug_in);
#ifdef ENABLE_TEMP_RETURN
plug_in_main_loop (plug_in);
return_vals = plug_in_get_return_vals (plug_in, proc_rec);
#else
return_vals = procedural_db_return_args (proc_rec, TRUE);
#endif
plug_in->temp_proc_recs = g_list_remove (plug_in->temp_proc_recs,
proc_rec);
......
......@@ -1725,9 +1725,6 @@ gimp_proc_run (GPProcRun *proc_run)
}
#define ENABLE_TEMP_RETURN 1
static void
gimp_temp_proc_run (GPProcRun *proc_run)
{
......@@ -1738,9 +1735,7 @@ gimp_temp_proc_run (GPProcRun *proc_run)
if (run_proc)
{
#ifdef ENABLE_TEMP_RETURN
GPProcReturn proc_return;
#endif
GimpParam *return_vals;
gint n_return_vals;
......@@ -1750,14 +1745,12 @@ gimp_temp_proc_run (GPProcRun *proc_run)
&n_return_vals,
&return_vals);
#ifdef ENABLE_TEMP_RETURN
proc_return.name = proc_run->name;
proc_return.nparams = n_return_vals;
proc_return.params = (GPParam *) return_vals;
if (! gp_temp_proc_return_write (_writechannel, &proc_return, NULL))
gimp_quit ();
#endif
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment