[gimp] app: rename GimpImage.selected_symmetry to .active_symmetry

[Michael Natterer <mitch src gnome org>]

commit 02f76b4c7b4115af4bbd0f5646639655adcfede3
Author: Michael Natterer <mitch gimp org>
Date:   Wed Feb 3 21:25:17 2016 +0100

    app: rename GimpImage.selected_symmetry to .active_symmetry
    
    because that's the usual naming. Also change the set/get API accordingly.

 app/core/gimpimage-private.h     |    2 +-
 app/core/gimpimage-symmetry.c    |   22 +++++++++++-----------
 app/core/gimpimage-symmetry.h    |   22 +++++++++++-----------
 app/core/gimpimage.c             |   28 ++++++++++++++++------------
 app/paint/gimppaintcore.c        |    3 ++-
 app/widgets/gimpsymmetryeditor.c |    8 ++++----
 6 files changed, 45 insertions(+), 40 deletions(-)
---
diff --git a/app/core/gimpimage-private.h b/app/core/gimpimage-private.h
index 5fc38eb..6dbfea2 100644
--- a/app/core/gimpimage-private.h
+++ b/app/core/gimpimage-private.h
@@ -88,7 +88,7 @@ struct _GimpImagePrivate
   GeglNode          *visible_mask;          /*  component visibility node    */
 
   GList             *symmetries;            /*  Painting symmetries          */
-  GimpSymmetry      *selected_symmetry;     /*  Selected symmetry            */
+  GimpSymmetry      *active_symmetry;       /*  Active symmetry              */
 
   GList             *guides;                /*  guides                       */
   GimpGrid          *grid;                  /*  grid                         */
diff --git a/app/core/gimpimage-symmetry.c b/app/core/gimpimage-symmetry.c
index ff4a07f..356f72c 100644
--- a/app/core/gimpimage-symmetry.c
+++ b/app/core/gimpimage-symmetry.c
@@ -84,7 +84,7 @@ gimp_image_symmetry_new (GimpImage *image,
  * @type:  the #GType of the symmetry
  *
  * Add a symmetry of type @type to @image and make it the
- * selected transformation.
+ * active transformation.
  **/
 void
 gimp_image_symmetry_add (GimpImage    *image,
@@ -107,7 +107,7 @@ gimp_image_symmetry_add (GimpImage    *image,
  * @sym: the #GimpSymmetry
  *
  * Remove @sym from the list of symmetries of @image.
- * If it was the selected transformation, unselect it first.
+ * If it was the active transformation, unselect it first.
  **/
 void
 gimp_image_symmetry_remove (GimpImage    *image,
@@ -120,8 +120,8 @@ gimp_image_symmetry_remove (GimpImage    *image,
 
   private = GIMP_IMAGE_GET_PRIVATE (image);
 
-  if (private->selected_symmetry == sym)
-    gimp_image_symmetry_select (image, G_TYPE_NONE);
+  if (private->active_symmetry == sym)
+    gimp_image_set_active_symmetry (image, G_TYPE_NONE);
 
   private->symmetries = g_list_remove (private->symmetries,
                                        sym);
@@ -148,7 +148,7 @@ gimp_image_symmetry_get (GimpImage *image)
 }
 
 /**
- * gimp_image_symmetry_select:
+ * gimp_image_set_active_symmetry:
  * @image: the #GimpImage
  * @type:  the #GType of the symmetry
  *
@@ -159,8 +159,8 @@ gimp_image_symmetry_get (GimpImage *image)
  * Returns TRUE on success, FALSE if no such symmetry was found.
  **/
 gboolean
-gimp_image_symmetry_select (GimpImage *image,
-                            GType      type)
+gimp_image_set_active_symmetry (GimpImage *image,
+                                GType      type)
 {
   g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
 
@@ -172,13 +172,13 @@ gimp_image_symmetry_select (GimpImage *image,
 }
 
 /**
- * gimp_image_symmetry_selected:
+ * gimp_image_get_active_symmetry:
  * @image: the #GimpImage
  *
- * Returns the #GimpSymmetry transformation selected on @image.
+ * Returns the #GimpSymmetry transformation active on @image.
  **/
 GimpSymmetry *
-gimp_image_symmetry_selected (GimpImage *image)
+gimp_image_get_active_symmetry (GimpImage *image)
 {
   GimpImagePrivate *private;
 
@@ -186,5 +186,5 @@ gimp_image_symmetry_selected (GimpImage *image)
 
   private = GIMP_IMAGE_GET_PRIVATE (image);
 
-  return private->selected_symmetry;
+  return private->active_symmetry;
 }
diff --git a/app/core/gimpimage-symmetry.h b/app/core/gimpimage-symmetry.h
index 60b1f38..42b1d74 100644
--- a/app/core/gimpimage-symmetry.h
+++ b/app/core/gimpimage-symmetry.h
@@ -22,19 +22,19 @@
 #define __GIMP_IMAGE_SYMMETRY_H__
 
 
-GList        * gimp_image_symmetry_list      (void);
+GList        * gimp_image_symmetry_list       (void);
 
-GimpSymmetry * gimp_image_symmetry_new       (GimpImage    *image,
-                                              GType         type);
-void           gimp_image_symmetry_add       (GimpImage    *image,
-                                              GimpSymmetry *sym);
-void           gimp_image_symmetry_remove    (GimpImage    *image,
-                                              GimpSymmetry *sym);
-GList        * gimp_image_symmetry_get       (GimpImage    *image);
+GimpSymmetry * gimp_image_symmetry_new        (GimpImage    *image,
+                                               GType         type);
+void           gimp_image_symmetry_add        (GimpImage    *image,
+                                               GimpSymmetry *sym);
+void           gimp_image_symmetry_remove     (GimpImage    *image,
+                                               GimpSymmetry *sym);
+GList        * gimp_image_symmetry_get        (GimpImage    *image);
 
-gboolean       gimp_image_symmetry_select    (GimpImage    *image,
-                                              GType         type);
-GimpSymmetry * gimp_image_symmetry_selected  (GimpImage    *image);
+gboolean       gimp_image_set_active_symmetry (GimpImage    *image,
+                                               GType         type);
+GimpSymmetry * gimp_image_get_active_symmetry (GimpImage    *image);
 
 
 #endif  /*  __GIMP_IMAGE_SYMMETRY_H__  */
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 265bd2f..bb3e937 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -707,7 +707,7 @@ gimp_image_init (GimpImage *image)
   private->projection          = gimp_projection_new (GIMP_PROJECTABLE (image));
 
   private->symmetries          = NULL;
-  private->selected_symmetry   = NULL;
+  private->active_symmetry     = NULL;
 
   private->guides              = NULL;
   private->grid                = NULL;
@@ -878,30 +878,33 @@ gimp_image_set_property (GObject      *object,
         GList *iter;
         GType  type = g_value_get_gtype (value);
 
-        if (private->selected_symmetry)
-          g_object_set (private->selected_symmetry,
+        if (private->active_symmetry)
+          g_object_set (private->active_symmetry,
                         "active", FALSE,
                         NULL);
-        private->selected_symmetry = NULL;
+        private->active_symmetry = NULL;
 
         for (iter = private->symmetries; iter; iter = g_list_next (iter))
           {
             GimpSymmetry *sym = iter->data;
+
             if (type == G_TYPE_FROM_INSTANCE (sym))
-              private->selected_symmetry = iter->data;
+              private->active_symmetry = iter->data;
           }
 
-        if (private->selected_symmetry == NULL)
+        if (! private->active_symmetry &&
+            g_type_is_a (type, GIMP_TYPE_SYMMETRY))
           {
             GimpSymmetry *sym = gimp_image_symmetry_new (image, type);
 
             gimp_image_symmetry_add (image, sym);
-            private->selected_symmetry = sym;
+            private->active_symmetry = sym;
           }
 
-        g_object_set (private->selected_symmetry,
-                      "active", TRUE,
-                      NULL);
+        if (private->active_symmetry)
+          g_object_set (private->active_symmetry,
+                        "active", TRUE,
+                        NULL);
       }
       break;
     default:
@@ -947,8 +950,9 @@ gimp_image_get_property (GObject    *object,
       break;
     case PROP_SYMMETRY:
       g_value_set_gtype (value,
-                         private->selected_symmetry ?
-                         G_TYPE_FROM_INSTANCE (private->selected_symmetry) : GIMP_TYPE_SYMMETRY);
+                         private->active_symmetry ?
+                         G_TYPE_FROM_INSTANCE (private->active_symmetry) :
+                         G_TYPE_NONE);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
index d88da5e..514c8c1 100644
--- a/app/paint/gimppaintcore.c
+++ b/app/paint/gimppaintcore.c
@@ -325,12 +325,13 @@ gimp_paint_core_paint (GimpPaintCore    *core,
           core->last_paint.y = core->cur_coords.y;
         }
 
-      sym = g_object_ref (gimp_image_symmetry_selected (image));
+      sym = g_object_ref (gimp_image_get_active_symmetry (image));
       gimp_symmetry_set_origin (sym, drawable, &core->cur_coords);
 
       core_class->paint (core, drawable,
                          paint_options,
                          sym, paint_state, time);
+
       g_object_unref (sym);
 
       core_class->post_paint (core, drawable,
diff --git a/app/widgets/gimpsymmetryeditor.c b/app/widgets/gimpsymmetryeditor.c
index 03adf8f..4a1b9c3 100644
--- a/app/widgets/gimpsymmetryeditor.c
+++ b/app/widgets/gimpsymmetryeditor.c
@@ -47,7 +47,7 @@
 enum
 {
   PROP_0,
-  PROP_GIMP,
+  PROP_GIMP
 };
 
 
@@ -308,7 +308,7 @@ gimp_symmetry_editor_image_changed (GimpContext        *context,
                         editor);
 
       /* Update the symmetry options. */
-      symmetry = gimp_image_symmetry_selected (image);
+      symmetry = gimp_image_get_active_symmetry (image);
       gimp_symmetry_editor_set_options (editor, symmetry);
       editor->p->image = g_object_ref (image);
     }
@@ -339,7 +339,7 @@ gimp_symmetry_editor_symmetry_notify (GimpImage           *image,
   GimpSymmetry *symmetry = NULL;
 
   if (image &&
-      (symmetry = gimp_image_symmetry_selected (image)))
+      (symmetry = gimp_image_get_active_symmetry (image)))
     {
       g_signal_connect (symmetry, "update-ui",
                         G_CALLBACK (gimp_symmetry_editor_symmetry_updated),
@@ -360,7 +360,7 @@ gimp_symmetry_editor_symmetry_updated (GimpSymmetry       *symmetry,
 
   context = gimp_get_user_context (editor->p->gimp);
   if (image != context->image ||
-      symmetry != gimp_image_symmetry_selected (image))
+      symmetry != gimp_image_get_active_symmetry (image))
     {
       g_signal_handlers_disconnect_by_func (symmetry,
                                             gimp_symmetry_editor_symmetry_updated,