0449deee27
2004-12-14 Michael Natterer <mitch@gimp.org> * app/plug-in/plug-in-proc-frame.[ch]: added "gint ref_count" to the PlugInProcFrame struct. Added new functions plug_in_proc_frame_ref/unref(). (plug_in_proc_frame_new): set the ref_count to 1. * app/plug-in/plug-in.[ch] (plug_in_proc_frame_push): return the new proc_frame. (plug_in_proc_frame_pop): use unref() instead of free(). * app/plug-in/plug-in-run.c (plug_in_temp_run): ref the proc_frame while running its main loop. Removed the call to plug_in_proc_frame_pop(). * app/plug-in/plug-in-message.c (plug_in_handle_temp_proc_return): call plug_in_proc_frame_pop() immediately after plug_in_main_loop_quit() so the proc_frame goes away from the stack and can't be used accidentially if the core is too busy to return to the main loop before the next command arrives on the wire. Really fixes bug #161114 this time.
142 lines
3.9 KiB
C
142 lines
3.9 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* plug-in-proc-frame.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "plug-in-types.h"
|
|
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpprogress.h"
|
|
|
|
#include "plug-in-proc-frame.h"
|
|
#include "plug-in-progress.h"
|
|
|
|
|
|
/* publuc functions */
|
|
|
|
PlugInProcFrame *
|
|
plug_in_proc_frame_new (GimpContext *context,
|
|
GimpProgress *progress,
|
|
ProcRecord *proc_rec)
|
|
{
|
|
PlugInProcFrame *proc_frame;
|
|
|
|
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
|
|
g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
|
|
g_return_val_if_fail (proc_rec != NULL, NULL);
|
|
|
|
proc_frame = g_new0 (PlugInProcFrame, 1);
|
|
|
|
proc_frame->ref_count = 1;
|
|
|
|
plug_in_proc_frame_init (proc_frame, context, progress, proc_rec);
|
|
|
|
return proc_frame;
|
|
}
|
|
|
|
void
|
|
plug_in_proc_frame_init (PlugInProcFrame *proc_frame,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
ProcRecord *proc_rec)
|
|
{
|
|
g_return_if_fail (proc_frame != NULL);
|
|
g_return_if_fail (GIMP_IS_CONTEXT (context));
|
|
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
|
|
|
|
proc_frame->main_context = g_object_ref (context);
|
|
proc_frame->context_stack = NULL;
|
|
proc_frame->proc_rec = proc_rec;
|
|
proc_frame->main_loop = NULL;
|
|
proc_frame->return_vals = NULL;
|
|
proc_frame->n_return_vals = 0;
|
|
proc_frame->progress = progress ? g_object_ref (progress) : NULL;
|
|
proc_frame->progress_created = FALSE;
|
|
proc_frame->progress_cancel_id = 0;
|
|
}
|
|
|
|
void
|
|
plug_in_proc_frame_dispose (PlugInProcFrame *proc_frame,
|
|
PlugIn *plug_in)
|
|
{
|
|
g_return_if_fail (proc_frame != NULL);
|
|
g_return_if_fail (plug_in != NULL);
|
|
|
|
if (proc_frame->progress)
|
|
{
|
|
plug_in_progress_end (plug_in);
|
|
|
|
if (proc_frame->progress)
|
|
{
|
|
g_object_unref (proc_frame->progress);
|
|
proc_frame->progress = NULL;
|
|
}
|
|
}
|
|
|
|
if (proc_frame->context_stack)
|
|
{
|
|
g_list_foreach (proc_frame->context_stack, (GFunc) g_object_unref, NULL);
|
|
g_list_free (proc_frame->context_stack);
|
|
proc_frame->context_stack = NULL;
|
|
}
|
|
|
|
if (proc_frame->main_context)
|
|
{
|
|
g_object_unref (proc_frame->main_context);
|
|
proc_frame->main_context = NULL;
|
|
}
|
|
}
|
|
|
|
void
|
|
plug_in_proc_frame_free (PlugInProcFrame *proc_frame,
|
|
PlugIn *plug_in)
|
|
{
|
|
g_return_if_fail (proc_frame != NULL);
|
|
g_return_if_fail (plug_in != NULL);
|
|
|
|
plug_in_proc_frame_dispose (proc_frame, plug_in);
|
|
|
|
g_free (proc_frame);
|
|
}
|
|
|
|
PlugInProcFrame *
|
|
plug_in_proc_frame_ref (PlugInProcFrame *proc_frame)
|
|
{
|
|
g_return_val_if_fail (proc_frame != NULL, NULL);
|
|
|
|
proc_frame->ref_count++;
|
|
|
|
return proc_frame;
|
|
}
|
|
|
|
void
|
|
plug_in_proc_frame_unref (PlugInProcFrame *proc_frame,
|
|
PlugIn *plug_in)
|
|
{
|
|
g_return_if_fail (proc_frame != NULL);
|
|
g_return_if_fail (plug_in != NULL);
|
|
|
|
proc_frame->ref_count--;
|
|
|
|
if (proc_frame->ref_count < 1)
|
|
plug_in_proc_frame_free (proc_frame, plug_in);
|
|
}
|