gimp r27692 - in trunk: . app/actions app/core app/dialogs app/display app/gui app/menus app/tools app/widgets app/xcf

[martinn svn gnome org]

Author: martinn
Date: Thu Nov 20 22:45:19 2008
New Revision: 27692
URL: http://svn.gnome.org/viewvc/gimp?rev=27692&view=rev

Log:
s/gimp_container_children_type/gimp_container_get_children_type/
s/gimp_container_policy/gimp_container_get_policy/
s/gimp_container_num_children/gimp_container_get_n_children/

* app/actions/actions.c
* app/actions/file-actions.c
* app/actions/file-commands.c
* app/actions/tool-options-actions.c
* app/actions/tools-actions.c
* app/actions/tools-commands.c
* app/actions/vectors-actions.c
* app/core/gimpcontainer-filter.c
* app/core/gimpcontainer.c
* app/core/gimpcontainer.h
* app/core/gimpimage-convert.c
* app/core/gimpimage-flip.c
* app/core/gimpimage-merge.c
* app/core/gimpimage-resize.c
* app/core/gimpimage-rotate.c
* app/core/gimpimage-scale.c
* app/core/gimpimage-undo.c
* app/core/gimpimage.c
* app/core/gimpimagefile.c
* app/core/gimplist.c
* app/core/gimpundostack.c
* app/dialogs/palette-import-dialog.c
* app/dialogs/quit-dialog.c
* app/display/gimpdisplay.c
* app/display/gimpdisplayshell-layer-select.c
* app/display/gimpdisplayshell-title.c
* app/gui/gui-vtable.c
* app/menus/tool-options-menu.c
* app/tools/gimp-tools.c
* app/widgets/gimpcontrollerlist.c
* app/widgets/gimpimagepropview.c
* app/widgets/gimpsettingsbox.c
* app/widgets/gimpviewablebutton.c
* app/xcf/xcf-load.c
* app/xcf/xcf-save.c


Modified:
   trunk/ChangeLog
   trunk/app/actions/actions.c
   trunk/app/actions/file-actions.c
   trunk/app/actions/file-commands.c
   trunk/app/actions/tool-options-actions.c
   trunk/app/actions/tools-actions.c
   trunk/app/actions/tools-commands.c
   trunk/app/actions/vectors-actions.c
   trunk/app/core/gimpcontainer-filter.c
   trunk/app/core/gimpcontainer.c
   trunk/app/core/gimpcontainer.h
   trunk/app/core/gimpimage-convert.c
   trunk/app/core/gimpimage-flip.c
   trunk/app/core/gimpimage-merge.c
   trunk/app/core/gimpimage-resize.c
   trunk/app/core/gimpimage-rotate.c
   trunk/app/core/gimpimage-scale.c
   trunk/app/core/gimpimage-undo.c
   trunk/app/core/gimpimage.c
   trunk/app/core/gimpimagefile.c
   trunk/app/core/gimplist.c
   trunk/app/core/gimpundostack.c
   trunk/app/dialogs/palette-import-dialog.c
   trunk/app/dialogs/quit-dialog.c
   trunk/app/display/gimpdisplay.c
   trunk/app/display/gimpdisplayshell-layer-select.c
   trunk/app/display/gimpdisplayshell-title.c
   trunk/app/gui/gui-vtable.c
   trunk/app/menus/tool-options-menu.c
   trunk/app/tools/gimp-tools.c
   trunk/app/widgets/gimpcontrollerlist.c
   trunk/app/widgets/gimpimagepropview.c
   trunk/app/widgets/gimpsettingsbox.c
   trunk/app/widgets/gimpviewablebutton.c
   trunk/app/xcf/xcf-load.c
   trunk/app/xcf/xcf-save.c

Modified: trunk/app/actions/actions.c
==============================================================================
--- trunk/app/actions/actions.c	(original)
+++ trunk/app/actions/actions.c	Thu Nov 20 22:45:19 2008
@@ -531,7 +531,7 @@
   if (! current)
     return NULL;
 
-  n_children = gimp_container_num_children (container);
+  n_children = gimp_container_get_n_children (container);
 
   if (n_children == 0)
     return NULL;

Modified: trunk/app/actions/file-actions.c
==============================================================================
--- trunk/app/actions/file-actions.c	(original)
+++ trunk/app/actions/file-actions.c	Thu Nov 20 22:45:19 2008
@@ -260,7 +260,7 @@
   gint i;
   gint n = GIMP_GUI_CONFIG (group->gimp->config)->last_opened_size;
 
-  num_documents = gimp_container_num_children (container);
+  num_documents = gimp_container_get_n_children (container);
 
   for (i = 0; i < n; i++)
     {
@@ -330,7 +330,7 @@
                                GimpActionGroup *group)
 {
   GimpContainer *container  = group->gimp->displays;
-  gint           n_displays = gimp_container_num_children (container);
+  gint           n_displays = gimp_container_get_n_children (container);
   gboolean       sensitive  = (n_displays > 0);
 
   if (n_displays == 1)

Modified: trunk/app/actions/file-commands.c
==============================================================================
--- trunk/app/actions/file-commands.c	(original)
+++ trunk/app/actions/file-commands.c	Thu Nov 20 22:45:19 2008
@@ -149,7 +149,7 @@
   gint           num_entries;
   return_if_no_gimp (gimp, data);
 
-  num_entries = gimp_container_num_children (gimp->documents);
+  num_entries = gimp_container_get_n_children (gimp->documents);
 
   if (value >= num_entries)
     return;

Modified: trunk/app/actions/tool-options-actions.c
==============================================================================
--- trunk/app/actions/tool-options-actions.c	(original)
+++ trunk/app/actions/tool-options-actions.c	Thu Nov 20 22:45:19 2008
@@ -179,7 +179,7 @@
     }
 
   if (presets)
-    n_children = gimp_container_num_children (presets);
+    n_children = gimp_container_get_n_children (presets);
 
   if (n_children > 0)
     {

Modified: trunk/app/actions/tools-actions.c
==============================================================================
--- trunk/app/actions/tools-actions.c	(original)
+++ trunk/app/actions/tools-actions.c	Thu Nov 20 22:45:19 2008
@@ -702,7 +702,7 @@
 
       SET_ACTIVE ("tools-visibility", tool_info->visible);
 
-      last_index = gimp_container_num_children (container) -1;
+      last_index = gimp_container_get_n_children (container) -1;
       index      = gimp_container_get_child_index   (container,
                                                      GIMP_OBJECT (tool_info));
 

Modified: trunk/app/actions/tools-commands.c
==============================================================================
--- trunk/app/actions/tools-commands.c	(original)
+++ trunk/app/actions/tools-commands.c	Thu Nov 20 22:45:19 2008
@@ -190,7 +190,7 @@
       index     = gimp_container_get_child_index (container,
                                                   GIMP_OBJECT (tool_info));
 
-      if (index + 1 < gimp_container_num_children (container))
+      if (index + 1 < gimp_container_get_n_children (container))
         gimp_container_reorder (container, GIMP_OBJECT (tool_info), index + 1);
     }
 }
@@ -211,7 +211,7 @@
       gint           index;
 
       container = context->gimp->tool_info_list;
-      index     = gimp_container_num_children (container) - 1;
+      index     = gimp_container_get_n_children (container) - 1;
 
       index = index >= 0 ? index : 0;
 

Modified: trunk/app/actions/vectors-actions.c
==============================================================================
--- trunk/app/actions/vectors-actions.c	(original)
+++ trunk/app/actions/vectors-actions.c	Thu Nov 20 22:45:19 2008
@@ -249,7 +249,7 @@
 
   if (image)
     {
-      n_vectors  = gimp_container_num_children (image->vectors);
+      n_vectors  = gimp_container_get_n_children (image->vectors);
       mask_empty = gimp_channel_is_empty (gimp_image_get_mask (image));
       global_buf = FALSE;
 

Modified: trunk/app/core/gimpcontainer-filter.c
==============================================================================
--- trunk/app/core/gimpcontainer-filter.c	(original)
+++ trunk/app/core/gimpcontainer-filter.c	Thu Nov 20 22:45:19 2008
@@ -72,7 +72,7 @@
 
   result =
     g_object_new (G_TYPE_FROM_INSTANCE (container),
-                  "children-type", gimp_container_children_type (container),
+                  "children-type", gimp_container_get_children_type (container),
                   "policy",        GIMP_CONTAINER_POLICY_WEAK,
                   NULL);
 

Modified: trunk/app/core/gimpcontainer.c
==============================================================================
--- trunk/app/core/gimpcontainer.c	(original)
+++ trunk/app/core/gimpcontainer.c	Thu Nov 20 22:45:19 2008
@@ -519,7 +519,7 @@
 }
 
 GType
-gimp_container_children_type (const GimpContainer *container)
+gimp_container_get_children_type (const GimpContainer *container)
 {
   g_return_val_if_fail (GIMP_IS_CONTAINER (container), G_TYPE_NONE);
 
@@ -527,7 +527,7 @@
 }
 
 GimpContainerPolicy
-gimp_container_policy (const GimpContainer *container)
+gimp_container_get_policy (const GimpContainer *container)
 {
   g_return_val_if_fail (GIMP_IS_CONTAINER (container), 0);
 
@@ -535,7 +535,7 @@
 }
 
 gint
-gimp_container_num_children (const GimpContainer *container)
+gimp_container_get_n_children (const GimpContainer *container)
 {
   g_return_val_if_fail (GIMP_IS_CONTAINER (container), 0);
 
@@ -903,7 +903,7 @@
   g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
   g_return_val_if_fail (length != NULL, NULL);
 
-  *length = gimp_container_num_children (container);
+  *length = gimp_container_get_n_children (container);
   if (*length == 0)
     return NULL;
 

Modified: trunk/app/core/gimpcontainer.h
==============================================================================
--- trunk/app/core/gimpcontainer.h	(original)
+++ trunk/app/core/gimpcontainer.h	Thu Nov 20 22:45:19 2008
@@ -82,9 +82,9 @@
 
 GType        gimp_container_get_type           (void) G_GNUC_CONST;
 
-GType        gimp_container_children_type      (const GimpContainer *container);
-GimpContainerPolicy gimp_container_policy      (const GimpContainer *container);
-gint         gimp_container_num_children       (const GimpContainer *container);
+GType        gimp_container_get_children_type  (const GimpContainer *container);
+GimpContainerPolicy gimp_container_get_policy  (const GimpContainer *container);
+gint         gimp_container_get_n_children     (const GimpContainer *container);
 
 gboolean     gimp_container_add                (GimpContainer       *container,
                                                 GimpObject          *object);

Modified: trunk/app/core/gimpimage-convert.c
==============================================================================
--- trunk/app/core/gimpimage-convert.c	(original)
+++ trunk/app/core/gimpimage-convert.c	Thu Nov 20 22:45:19 2008
@@ -798,7 +798,7 @@
 
   gimp_set_busy (image->gimp);
 
-  n_layers = gimp_container_num_children (GIMP_CONTAINER (image->layers));
+  n_layers = gimp_container_get_n_children (GIMP_CONTAINER (image->layers));
 
   switch (new_type)
     {

Modified: trunk/app/core/gimpimage-flip.c
==============================================================================
--- trunk/app/core/gimpimage-flip.c	(original)
+++ trunk/app/core/gimpimage-flip.c	Thu Nov 20 22:45:19 2008
@@ -69,9 +69,9 @@
       return;
     }
 
-  progress_max = (gimp_container_num_children (image->channels) +
-                  gimp_container_num_children (image->layers)   +
-                  gimp_container_num_children (image->vectors)  +
+  progress_max = (gimp_container_get_n_children (image->channels) +
+                  gimp_container_get_n_children (image->layers)   +
+                  gimp_container_get_n_children (image->vectors)  +
                   1 /* selection */);
 
   gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_FLIP, NULL);

Modified: trunk/app/core/gimpimage-merge.c
==============================================================================
--- trunk/app/core/gimpimage-merge.c	(original)
+++ trunk/app/core/gimpimage-merge.c	Thu Nov 20 22:45:19 2008
@@ -486,7 +486,7 @@
        */
       layer = reverse_list->data;
       position =
-        gimp_container_num_children (image->layers) -
+        gimp_container_get_n_children (image->layers) -
         gimp_container_get_child_index (image->layers, GIMP_OBJECT (layer));
     }
 
@@ -601,7 +601,7 @@
       /*  Add the layer to the image  */
       gimp_image_add_layer
         (image, merge_layer,
-         gimp_container_num_children (image->layers) - position + 1,
+         gimp_container_get_n_children (image->layers) - position + 1,
          TRUE);
     }
 

Modified: trunk/app/core/gimpimage-resize.c
==============================================================================
--- trunk/app/core/gimpimage-resize.c	(original)
+++ trunk/app/core/gimpimage-resize.c	Thu Nov 20 22:45:19 2008
@@ -79,9 +79,9 @@
 
   gimp_set_busy (image->gimp);
 
-  progress_max = (gimp_container_num_children (image->channels) +
-                  gimp_container_num_children (image->layers)   +
-                  gimp_container_num_children (image->vectors)  +
+  progress_max = (gimp_container_get_n_children (image->channels) +
+                  gimp_container_get_n_children (image->layers)   +
+                  gimp_container_get_n_children (image->vectors)  +
                   1 /* selection */);
 
   g_object_freeze_notify (G_OBJECT (image));

Modified: trunk/app/core/gimpimage-rotate.c
==============================================================================
--- trunk/app/core/gimpimage-rotate.c	(original)
+++ trunk/app/core/gimpimage-rotate.c	Thu Nov 20 22:45:19 2008
@@ -79,9 +79,9 @@
   center_x              = previous_image_width  / 2.0;
   center_y              = previous_image_height / 2.0;
 
-  progress_max = (gimp_container_num_children (image->channels) +
-                  gimp_container_num_children (image->layers)   +
-                  gimp_container_num_children (image->vectors)  +
+  progress_max = (gimp_container_get_n_children (image->channels) +
+                  gimp_container_get_n_children (image->layers)   +
+                  gimp_container_get_n_children (image->vectors)  +
                   1 /* selection */);
 
   g_object_freeze_notify (G_OBJECT (image));

Modified: trunk/app/core/gimpimage-scale.c
==============================================================================
--- trunk/app/core/gimpimage-scale.c	(original)
+++ trunk/app/core/gimpimage-scale.c	Thu Nov 20 22:45:19 2008
@@ -71,9 +71,9 @@
 
   sub_progress = gimp_sub_progress_new (progress);
 
-  progress_steps = (gimp_container_num_children (image->channels) +
-                    gimp_container_num_children (image->layers)   +
-                    gimp_container_num_children (image->vectors)  +
+  progress_steps = (gimp_container_get_n_children (image->channels) +
+                    gimp_container_get_n_children (image->layers)   +
+                    gimp_container_get_n_children (image->vectors)  +
                     1 /* selection */);
 
   g_object_freeze_notify (G_OBJECT (image));

Modified: trunk/app/core/gimpimage-undo.c
==============================================================================
--- trunk/app/core/gimpimage-undo.c	(original)
+++ trunk/app/core/gimpimage-undo.c	Thu Nov 20 22:45:19 2008
@@ -419,23 +419,23 @@
 
 #ifdef DEBUG_IMAGE_UNDO
   g_printerr ("undo_steps: %d    undo_bytes: %ld\n",
-              gimp_container_num_children (container),
+              gimp_container_get_n_children (container),
               (glong) gimp_object_get_memsize (GIMP_OBJECT (container), NULL));
 #endif
 
   /*  keep at least min_undo_levels undo steps  */
-  if (gimp_container_num_children (container) <= min_undo_levels)
+  if (gimp_container_get_n_children (container) <= min_undo_levels)
     return;
 
   while ((gimp_object_get_memsize (GIMP_OBJECT (container), NULL) > undo_size) ||
-         (gimp_container_num_children (container) > max_undo_levels))
+         (gimp_container_get_n_children (container) > max_undo_levels))
     {
       GimpUndo *freed = gimp_undo_stack_free_bottom (image->undo_stack,
                                                      GIMP_UNDO_MODE_UNDO);
 
 #ifdef DEBUG_IMAGE_UNDO
       g_printerr ("freed one step: undo_steps: %d    undo_bytes: %ld\n",
-                  gimp_container_num_children (container),
+                  gimp_container_get_n_children (container),
                   (glong) gimp_object_get_memsize (GIMP_OBJECT (container),
                                                    NULL));
 #endif
@@ -444,7 +444,7 @@
 
       g_object_unref (freed);
 
-      if (gimp_container_num_children (container) <= min_undo_levels)
+      if (gimp_container_get_n_children (container) <= min_undo_levels)
         return;
     }
 }
@@ -456,21 +456,21 @@
 
 #ifdef DEBUG_IMAGE_UNDO
   g_printerr ("redo_steps: %d    redo_bytes: %ld\n",
-              gimp_container_num_children (container),
+              gimp_container_get_n_children (container),
               (glong) gimp_object_get_memsize (GIMP_OBJECT (container), NULL));
 #endif
 
   if (gimp_container_is_empty (container))
     return;
 
-  while (gimp_container_num_children (container) > 0)
+  while (gimp_container_get_n_children (container) > 0)
     {
       GimpUndo *freed = gimp_undo_stack_free_bottom (image->redo_stack,
                                                      GIMP_UNDO_MODE_REDO);
 
 #ifdef DEBUG_IMAGE_UNDO
       g_printerr ("freed one step: redo_steps: %d    redo_bytes: %ld\n",
-                  gimp_container_num_children (container),
+                  gimp_container_get_n_children (container),
                   (glong )gimp_object_get_memsize (GIMP_OBJECT (container),
                                                    NULL));
 #endif

Modified: trunk/app/core/gimpimage.c
==============================================================================
--- trunk/app/core/gimpimage.c	(original)
+++ trunk/app/core/gimpimage.c	Thu Nov 20 22:45:19 2008
@@ -1263,7 +1263,7 @@
 gimp_image_layer_alpha_changed (GimpDrawable *drawable,
                                 GimpImage    *image)
 {
-  if (gimp_container_num_children (image->layers) == 1)
+  if (gimp_container_get_n_children (image->layers) == 1)
     image->flush_accum.alpha_changed = TRUE;
 }
 
@@ -1610,7 +1610,7 @@
 
   layer = gimp_image_get_layer_by_index (image, 0);
 
-  return ((gimp_container_num_children (image->layers) > 1) ||
+  return ((gimp_container_get_n_children (image->layers) > 1) ||
           (layer && gimp_drawable_has_alpha (GIMP_DRAWABLE (layer))));
 }
 
@@ -2968,7 +2968,7 @@
     position = 1;
 
   /*  Don't add at a non-existing index  */
-  position = MIN (position, gimp_container_num_children (image->layers));
+  position = MIN (position, gimp_container_get_n_children (image->layers));
 
   gimp_container_insert (image->layers, GIMP_OBJECT (layer), position);
 
@@ -3077,7 +3077,7 @@
         }
       else
         {
-          gint n_children = gimp_container_num_children (image->layers);
+          gint n_children = gimp_container_get_n_children (image->layers);
 
           if (n_children > 0)
             {
@@ -3212,7 +3212,7 @@
   index = gimp_container_get_child_index (image->layers,
                                           GIMP_OBJECT (layer));
 
-  if (index == gimp_container_num_children (image->layers) - 1)
+  if (index == gimp_container_get_n_children (image->layers) - 1)
     {
       g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
 			   _("Layer cannot be lowered more."));
@@ -3243,7 +3243,7 @@
   g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
   g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
 
-  length = gimp_container_num_children (image->layers);
+  length = gimp_container_get_n_children (image->layers);
 
   return gimp_image_position_layer (image, layer, length - 1,
                                     TRUE, _("Lower Layer to Bottom"));
@@ -3267,7 +3267,7 @@
   if (index < 0)
     return FALSE;
 
-  num_layers = gimp_container_num_children (image->layers);
+  num_layers = gimp_container_get_n_children (image->layers);
 
   new_index = CLAMP (new_index, 0, num_layers - 1);
 
@@ -3313,7 +3313,7 @@
     }
 
   /*  Don't add at a non-existing index  */
-  position = MIN (position, gimp_container_num_children (image->channels));
+  position = MIN (position, gimp_container_get_n_children (image->channels));
 
   gimp_container_insert (image->channels, GIMP_OBJECT (channel), position);
 
@@ -3378,7 +3378,7 @@
         }
       else
         {
-          gint n_children = gimp_container_num_children (image->channels);
+          gint n_children = gimp_container_get_n_children (image->channels);
 
           if (n_children > 0)
             {
@@ -3455,7 +3455,7 @@
   index = gimp_container_get_child_index (image->channels,
                                           GIMP_OBJECT (channel));
 
-  if (index == gimp_container_num_children (image->channels) - 1)
+  if (index == gimp_container_get_n_children (image->channels) - 1)
     {
       g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
 			   _("Channel cannot be lowered more."));
@@ -3475,7 +3475,7 @@
   g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
   g_return_val_if_fail (GIMP_IS_CHANNEL (channel), FALSE);
 
-  length = gimp_container_num_children (image->channels);
+  length = gimp_container_get_n_children (image->channels);
 
   return gimp_image_position_channel (image, channel, length - 1,
                                       TRUE, _("Lower Channel to Bottom"));
@@ -3499,7 +3499,7 @@
   if (index < 0)
     return FALSE;
 
-  num_channels = gimp_container_num_children (image->channels);
+  num_channels = gimp_container_get_n_children (image->channels);
 
   new_index = CLAMP (new_index, 0, num_channels - 1);
 
@@ -3546,7 +3546,7 @@
     }
 
   /*  Don't add at a non-existing index  */
-  position = MIN (position, gimp_container_num_children (image->vectors));
+  position = MIN (position, gimp_container_get_n_children (image->vectors));
 
   gimp_container_insert (image->vectors, GIMP_OBJECT (vectors), position);
 
@@ -3592,7 +3592,7 @@
         }
       else
         {
-          gint n_children = gimp_container_num_children (image->vectors);
+          gint n_children = gimp_container_get_n_children (image->vectors);
 
           if (n_children > 0)
             {
@@ -3662,7 +3662,7 @@
   index = gimp_container_get_child_index (image->vectors,
                                           GIMP_OBJECT (vectors));
 
-  if (index == gimp_container_num_children (image->vectors) - 1)
+  if (index == gimp_container_get_n_children (image->vectors) - 1)
     {
       g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
 			   _("Path cannot be lowered more."));
@@ -3682,7 +3682,7 @@
   g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
   g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
 
-  length = gimp_container_num_children (image->vectors);
+  length = gimp_container_get_n_children (image->vectors);
 
   return gimp_image_position_vectors (image, vectors, length - 1,
                                       TRUE, _("Lower Path to Bottom"));
@@ -3706,7 +3706,7 @@
   if (index < 0)
     return FALSE;
 
-  num_vectors = gimp_container_num_children (image->vectors);
+  num_vectors = gimp_container_get_n_children (image->vectors);
 
   new_index = CLAMP (new_index, 0, num_vectors - 1);
 

Modified: trunk/app/core/gimpimagefile.c
==============================================================================
--- trunk/app/core/gimpimagefile.c	(original)
+++ trunk/app/core/gimpimagefile.c	Thu Nov 20 22:45:19 2008
@@ -825,7 +825,7 @@
                 "image-width",      gimp_image_get_width  (image),
                 "image-height",     gimp_image_get_height (image),
                 "image-type",       desc->value_desc,
-                "image-num-layers", gimp_container_num_children (image->layers),
+                "image-num-layers", gimp_container_get_n_children (image->layers),
                 NULL);
 }
 

Modified: trunk/app/core/gimplist.c
==============================================================================
--- trunk/app/core/gimplist.c	(original)
+++ trunk/app/core/gimplist.c	Thu Nov 20 22:45:19 2008
@@ -194,10 +194,10 @@
   GimpList *list    = GIMP_LIST (object);
   gint64    memsize = 0;
 
-  memsize += (gimp_container_num_children (GIMP_CONTAINER (list)) *
+  memsize += (gimp_container_get_n_children (GIMP_CONTAINER (list)) *
               sizeof (GList));
 
-  if (gimp_container_policy (GIMP_CONTAINER (list)) ==
+  if (gimp_container_get_policy (GIMP_CONTAINER (list)) ==
       GIMP_CONTAINER_POLICY_STRONG)
     {
       GList *glist;

Modified: trunk/app/core/gimpundostack.c
==============================================================================
--- trunk/app/core/gimpundostack.c	(original)
+++ trunk/app/core/gimpundostack.c	Thu Nov 20 22:45:19 2008
@@ -208,5 +208,5 @@
 {
   g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), 0);
 
-  return gimp_container_num_children (stack->undos);
+  return gimp_container_get_n_children (stack->undos);
 }

Modified: trunk/app/dialogs/palette-import-dialog.c
==============================================================================
--- trunk/app/dialogs/palette-import-dialog.c	(original)
+++ trunk/app/dialogs/palette-import-dialog.c	Thu Nov 20 22:45:19 2008
@@ -747,7 +747,7 @@
                              GimpImage     *image,
                              ImportDialog  *dialog)
 {
-  if (! gimp_container_num_children (dialog->context->gimp->images))
+  if (! gimp_container_get_n_children (dialog->context->gimp->images))
     {
       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->image_radio)))
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->gradient_radio),

Modified: trunk/app/dialogs/quit-dialog.c
==============================================================================
--- trunk/app/dialogs/quit-dialog.c	(original)
+++ trunk/app/dialogs/quit-dialog.c	Thu Nov 20 22:45:19 2008
@@ -143,7 +143,7 @@
                                            -1);
 
   view_size = gimp->config->layer_preview_size;
-  rows      = CLAMP (gimp_container_num_children (images), 3, 6);
+  rows      = CLAMP (gimp_container_get_n_children (images), 3, 6);
 
   view = gimp_container_tree_view_new (images, context, view_size, 1);
   gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (view),
@@ -205,7 +205,7 @@
                                          GimpObject     *image,
                                          GimpMessageBox *box)
 {
-  gint       num_images = gimp_container_num_children (images);
+  gint       num_images = gimp_container_get_n_children (images);
   GtkWidget *label      = g_object_get_data (G_OBJECT (box), "lost-label");
   GtkWidget *button     = g_object_get_data (G_OBJECT (box), "ok-button");
   GtkWidget *dialog     = gtk_widget_get_toplevel (button);

Modified: trunk/app/display/gimpdisplay.c
==============================================================================
--- trunk/app/display/gimpdisplay.c	(original)
+++ trunk/app/display/gimpdisplay.c	Thu Nov 20 22:45:19 2008
@@ -453,7 +453,7 @@
 {
   g_return_if_fail (GIMP_IS_DISPLAY (display));
 
-  if (gimp_container_num_children (display->gimp->displays) > 1)
+  if (gimp_container_get_n_children (display->gimp->displays) > 1)
     {
       gimp_display_delete (display);
     }

Modified: trunk/app/display/gimpdisplayshell-layer-select.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-layer-select.c	(original)
+++ trunk/app/display/gimpdisplayshell-layer-select.c	Thu Nov 20 22:45:19 2008
@@ -208,8 +208,8 @@
   index += move;
 
   if (index < 0)
-    index = gimp_container_num_children (layer_select->image->layers) - 1;
-  else if (index >= gimp_container_num_children (layer_select->image->layers))
+    index = gimp_container_get_n_children (layer_select->image->layers) - 1;
+  else if (index >= gimp_container_get_n_children (layer_select->image->layers))
     index = 0;
 
   next_layer = gimp_image_get_layer_by_index (layer_select->image, index);

Modified: trunk/app/display/gimpdisplayshell-title.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-title.c	(original)
+++ trunk/app/display/gimpdisplayshell-title.c	Thu Nov 20 22:45:19 2008
@@ -310,12 +310,12 @@
 
             case 'l': /* number of layers */
               i += print (title, title_len, i, "%d",
-                          gimp_container_num_children (image->layers));
+                          gimp_container_get_n_children (image->layers));
               break;
 
             case 'L': /* number of layers (long) */
               {
-                gint num = gimp_container_num_children (image->layers);
+                gint num = gimp_container_get_n_children (image->layers);
 
                 i += print (title, title_len, i,
                             ngettext ("%d layer", "%d layers", num), num);

Modified: trunk/app/gui/gui-vtable.c
==============================================================================
--- trunk/app/gui/gui-vtable.c	(original)
+++ trunk/app/gui/gui-vtable.c	Thu Nov 20 22:45:19 2008
@@ -284,7 +284,7 @@
 {
   GimpObject *display = NULL;
 
-  if (gimp_container_num_children (gimp->displays) == 1)
+  if (gimp_container_get_n_children (gimp->displays) == 1)
     {
       display = gimp_container_get_first_child (gimp->displays);
 

Modified: trunk/app/menus/tool-options-menu.c
==============================================================================
--- trunk/app/menus/tool-options-menu.c	(original)
+++ trunk/app/menus/tool-options-menu.c	Thu Nov 20 22:45:19 2008
@@ -139,7 +139,7 @@
   gint n_children;
   gint i;
 
-  n_children = gimp_container_num_children (presets);
+  n_children = gimp_container_get_n_children (presets);
 
   for (i = 0; i < n_children; i++)
     {

Modified: trunk/app/tools/gimp-tools.c
==============================================================================
--- trunk/app/tools/gimp-tools.c	(original)
+++ trunk/app/tools/gimp-tools.c	Thu Nov 20 22:45:19 2008
@@ -248,7 +248,7 @@
   if (gimp_config_deserialize_file (GIMP_CONFIG (gimp_list), filename,
                                     NULL, NULL))
     {
-      gint n = gimp_container_num_children (gimp->tool_info_list);
+      gint n = gimp_container_get_n_children (gimp->tool_info_list);
       gint i;
 
       gimp_list_reverse (GIMP_LIST (gimp_list));

Modified: trunk/app/widgets/gimpcontrollerlist.c
==============================================================================
--- trunk/app/widgets/gimpcontrollerlist.c	(original)
+++ trunk/app/widgets/gimpcontrollerlist.c	Thu Nov 20 22:45:19 2008
@@ -704,7 +704,7 @@
   index = gimp_container_get_child_index (container,
                                           GIMP_OBJECT (list->dest_info));
 
-  if (index < gimp_container_num_children (container) - 1)
+  if (index < gimp_container_get_n_children (container) - 1)
     gimp_container_reorder (container, GIMP_OBJECT (list->dest_info),
                             index + 1);
 }

Modified: trunk/app/widgets/gimpimagepropview.c
==============================================================================
--- trunk/app/widgets/gimpimagepropview.c	(original)
+++ trunk/app/widgets/gimpimagepropview.c	Thu Nov 20 22:45:19 2008
@@ -514,17 +514,17 @@
 
   /*  number of layers  */
   g_snprintf (buf, sizeof (buf), "%d",
-              gimp_container_num_children (image->layers));
+              gimp_container_get_n_children (image->layers));
   gtk_label_set_text (GTK_LABEL (view->layers_label), buf);
 
   /*  number of channels  */
   g_snprintf (buf, sizeof (buf), "%d",
-              gimp_container_num_children (image->channels));
+              gimp_container_get_n_children (image->channels));
   gtk_label_set_text (GTK_LABEL (view->channels_label), buf);
 
   /*  number of vectors  */
   g_snprintf (buf, sizeof (buf), "%d",
-              gimp_container_num_children (image->vectors));
+              gimp_container_get_n_children (image->vectors));
   gtk_label_set_text (GTK_LABEL (view->vectors_label), buf);
 }
 

Modified: trunk/app/widgets/gimpsettingsbox.c
==============================================================================
--- trunk/app/widgets/gimpsettingsbox.c	(original)
+++ trunk/app/widgets/gimpsettingsbox.c	Thu Nov 20 22:45:19 2008
@@ -224,7 +224,7 @@
   g_assert (GIMP_IS_CONTAINER (box->container));
   g_assert (box->filename != NULL);
 
-  if (gimp_container_num_children (box->container) == 0)
+  if (gimp_container_get_n_children (box->container) == 0)
     gimp_settings_box_deserialize (box);
 
   box->combo = gimp_container_combo_box_new (box->container,

Modified: trunk/app/widgets/gimpviewablebutton.c
==============================================================================
--- trunk/app/widgets/gimpviewablebutton.c	(original)
+++ trunk/app/widgets/gimpviewablebutton.c	Thu Nov 20 22:45:19 2008
@@ -199,7 +199,7 @@
       gint n_children;
       gint new_index = index;
 
-      n_children = gimp_container_num_children (button->container);
+      n_children = gimp_container_get_n_children (button->container);
 
       if (sevent->direction == GDK_SCROLL_UP)
         {

Modified: trunk/app/xcf/xcf-load.c
==============================================================================
--- trunk/app/xcf/xcf-load.c	(original)
+++ trunk/app/xcf/xcf-load.c	Thu Nov 20 22:45:19 2008
@@ -201,7 +201,7 @@
       /* add the layer to the image if its not the floating selection */
       if (layer != info->floating_sel)
         gimp_image_add_layer (image, layer,
-                              gimp_container_num_children (image->layers),
+                              gimp_container_get_n_children (image->layers),
                               FALSE);
 
       /* restore the saved position so we'll be ready to
@@ -243,7 +243,7 @@
       /* add the channel to the image if its not the selection */
       if (channel != gimp_image_get_mask (image))
         gimp_image_add_channel (image, channel,
-                                gimp_container_num_children (image->channels),
+                                gimp_container_get_n_children (image->channels),
                                 FALSE);
 
       /* restore the saved position so we'll be ready to
@@ -1629,7 +1629,7 @@
     gimp_item_set_tattoo (GIMP_ITEM (vectors), tattoo);
 
   gimp_image_add_vectors (image, vectors,
-                          gimp_container_num_children (image->vectors),
+                          gimp_container_get_n_children (image->vectors),
                           FALSE);
 
   return TRUE;
@@ -1818,7 +1818,7 @@
     }
 
   gimp_image_add_vectors (image, vectors,
-                          gimp_container_num_children (image->vectors),
+                          gimp_container_get_n_children (image->vectors),
                           FALSE);
 
   return TRUE;

Modified: trunk/app/xcf/xcf-save.c
==============================================================================
--- trunk/app/xcf/xcf-save.c	(original)
+++ trunk/app/xcf/xcf-save.c	Thu Nov 20 22:45:19 2008
@@ -252,8 +252,8 @@
   xcf_write_int32_check_error (info, &value, 1);
 
   /* determine the number of layers and channels in the image */
-  n_layers   = (guint) gimp_container_num_children (image->layers);
-  n_channels = (guint) gimp_container_num_children (image->channels);
+  n_layers   = (guint) gimp_container_get_n_children (image->layers);
+  n_channels = (guint) gimp_container_get_n_children (image->channels);
 
   max_progress = 1 + n_layers + n_channels;
 
@@ -415,7 +415,7 @@
   if (unit < _gimp_unit_get_number_of_built_in_units (image->gimp))
     xcf_check_error (xcf_save_prop (info, image, PROP_UNIT, error, unit));
 
-  if (gimp_container_num_children (image->vectors) > 0)
+  if (gimp_container_get_n_children (image->vectors) > 0)
     {
       if (gimp_vectors_compat_is_compatible (image))
         xcf_check_error (xcf_save_prop (info, image, PROP_PATHS, error));
@@ -1605,7 +1605,7 @@
    * then each path:-
    */
 
-  num_paths = gimp_container_num_children (image->vectors);
+  num_paths = gimp_container_get_n_children (image->vectors);
 
   active_vectors = gimp_image_get_active_vectors (image);
 
@@ -1722,7 +1722,7 @@
     active_index = gimp_container_get_child_index (image->vectors,
                                                    GIMP_OBJECT (active_vectors));
 
-  num_paths = gimp_container_num_children (image->vectors);
+  num_paths = gimp_container_get_n_children (image->vectors);
 
   xcf_write_int32_check_error (info, &version,      1);
   xcf_write_int32_check_error (info, &active_index, 1);