[gimp/gimp-2-10] app: in gimp_gegl_apply_cached_operation(), s/cancellable/cancelable/



commit aa0df19af22839840e76bbe31a2367032e5291bd
Author: Ell <ell_se yahoo com>
Date:   Sat Jan 12 05:11:47 2019 -0500

    app: in gimp_gegl_apply_cached_operation(), s/cancellable/cancelable/
    
    To align gimp-2-10 with master, and fix commit
    50dc4571cbb8a30ac8b9d576fc8c167a92ef6dad.

 app/gegl/gimp-gegl-apply-operation.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-apply-operation.c b/app/gegl/gimp-gegl-apply-operation.c
index 40b8cd7447..652405195e 100644
--- a/app/gegl/gimp-gegl-apply-operation.c
+++ b/app/gegl/gimp-gegl-apply-operation.c
@@ -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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]