Commit aa0df19a authored by Ell's avatar Ell

app: in gimp_gegl_apply_cached_operation(), s/cancellable/cancelable/

To align gimp-2-10 with master, and fix commit
50dc4571.
parent 7547df54
......@@ -76,7 +76,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
GeglBuffer *cache,
const GeglRectangle *valid_rects,
gint n_valid_rects,
gboolean cancellable)
gboolean cancelable)
{
GeglNode *gegl;
GeglNode *effect;
......@@ -184,13 +184,13 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
gimp_progress_set_text_literal (progress, undo_desc);
progress_started = FALSE;
cancellable = FALSE;
cancelable = FALSE;
}
else
{
gimp_progress_start (progress, cancellable, "%s", undo_desc);
gimp_progress_start (progress, cancelable, "%s", undo_desc);
if (cancellable)
if (cancelable)
g_signal_connect (progress, "cancel",
G_CALLBACK (gimp_gegl_apply_operation_cancel),
&cancel);
......@@ -289,7 +289,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
{
gimp_progress_end (progress);
if (cancellable)
if (cancelable)
g_signal_handlers_disconnect_by_func (progress,
gimp_gegl_apply_operation_cancel,
&cancel);
......
Markdown is supported
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