From fb1660a4ea23d621c94f7f3e5ea16d7caf2410b3 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 14 Nov 2008 15:01:44 +0000 Subject: [PATCH] rename gimp_image_floating_sel() to gimp_image_get_floating_selection(). 2008-11-14 Michael Natterer * app/core/gimpimage.[ch]: rename gimp_image_floating_sel() to gimp_image_get_floating_selection(). * app/actions/channels-actions.c * app/actions/image-actions.c * app/actions/layers-actions.c * app/actions/layers-commands.c * app/actions/select-actions.c * app/core/gimpdrawable.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-merge.c * app/core/gimpimage-quick-mask.c * app/core/gimplayer-floating-sel.c * app/core/gimpselection.c * app/display/gimpdisplayshell-layer-select.c * app/display/gimpdisplayshell.c * app/tools/gimpeditselectiontool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpmovetool.c * app/tools/gimprectangleselecttool.c * app/tools/gimpregionselecttool.c * app/tools/gimpselectiontool.c * app/tools/gimptexttool.c * app/widgets/gimpdrawabletreeview.c * app/widgets/gimplayertreeview.c * app/xcf/xcf-save.c * tools/pdbgen/pdb/image.pdb: changed accordingly, replaced some instances of direct acces by the accessor. * app/pdb/image-cmds.c: regenerated. svn path=/trunk/; revision=27649 --- ChangeLog | 33 +++++++++++++++++++++ app/actions/channels-actions.c | 2 +- app/actions/image-actions.c | 2 +- app/actions/layers-actions.c | 2 +- app/actions/layers-commands.c | 4 +-- app/actions/select-actions.c | 2 +- app/core/gimpdrawable.c | 4 +-- app/core/gimpimage-duplicate.c | 4 +-- app/core/gimpimage-merge.c | 8 ++--- app/core/gimpimage-quick-mask.c | 4 +-- app/core/gimpimage.c | 18 +++++------ app/core/gimpimage.h | 2 +- app/core/gimplayer-floating-sel.c | 2 +- app/core/gimpselection.c | 2 +- app/display/gimpdisplayshell-layer-select.c | 2 +- app/display/gimpdisplayshell.c | 2 +- app/pdb/image-cmds.c | 4 +-- app/tools/gimpeditselectiontool.c | 2 +- app/tools/gimpfreeselecttool.c | 4 +-- app/tools/gimpmovetool.c | 8 +++-- app/tools/gimprectangleselecttool.c | 4 +-- app/tools/gimpregionselecttool.c | 4 +-- app/tools/gimpselectiontool.c | 2 +- app/tools/gimptexttool.c | 4 +-- app/widgets/gimpdrawabletreeview.c | 3 +- app/widgets/gimplayertreeview.c | 4 +-- app/xcf/xcf-save.c | 2 +- tools/pdbgen/pdb/image.pdb | 4 +-- 28 files changed, 87 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75532d1ac0..865dbffba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2008-11-14 Michael Natterer + + * app/core/gimpimage.[ch]: rename gimp_image_floating_sel() to + gimp_image_get_floating_selection(). + + * app/actions/channels-actions.c + * app/actions/image-actions.c + * app/actions/layers-actions.c + * app/actions/layers-commands.c + * app/actions/select-actions.c + * app/core/gimpdrawable.c + * app/core/gimpimage-duplicate.c + * app/core/gimpimage-merge.c + * app/core/gimpimage-quick-mask.c + * app/core/gimplayer-floating-sel.c + * app/core/gimpselection.c + * app/display/gimpdisplayshell-layer-select.c + * app/display/gimpdisplayshell.c + * app/tools/gimpeditselectiontool.c + * app/tools/gimpfreeselecttool.c + * app/tools/gimpmovetool.c + * app/tools/gimprectangleselecttool.c + * app/tools/gimpregionselecttool.c + * app/tools/gimpselectiontool.c + * app/tools/gimptexttool.c + * app/widgets/gimpdrawabletreeview.c + * app/widgets/gimplayertreeview.c + * app/xcf/xcf-save.c + * tools/pdbgen/pdb/image.pdb: changed accordingly, replaced some + instances of direct acces by the accessor. + + * app/pdb/image-cmds.c: regenerated. + 2008-11-14 Sven Neumann * app/display/gimpdisplayshell-scroll.[ch]: removed function diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c index 503fc6204c..07835319d7 100644 --- a/app/actions/channels-actions.c +++ b/app/actions/channels-actions.c @@ -153,7 +153,7 @@ channels_actions_update (GimpActionGroup *group, if (image) { - fs = (gimp_image_floating_sel (image) != NULL); + fs = (gimp_image_get_floating_selection (image) != NULL); if (GIMP_IS_COMPONENT_EDITOR (data)) { diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c index 63da89079a..aeaa417957 100644 --- a/app/actions/image-actions.c +++ b/app/actions/image-actions.c @@ -246,7 +246,7 @@ image_actions_update (GimpActionGroup *group, gimp_action_group_set_action_active (group, action, TRUE); - fs = (gimp_image_floating_sel (image) != NULL); + fs = (gimp_image_get_floating_selection (image) != NULL); aux = (gimp_image_get_active_channel (image) != NULL); lp = ! gimp_image_is_empty (image); sel = ! gimp_channel_is_empty (gimp_image_get_mask (image)); diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c index 839b521f34..e65f914856 100644 --- a/app/actions/layers-actions.c +++ b/app/actions/layers-actions.c @@ -481,7 +481,7 @@ layers_actions_update (GimpActionGroup *group, if (image) { - fs = (gimp_image_floating_sel (image) != NULL); + fs = (gimp_image_get_floating_selection (image) != NULL); ac = (gimp_image_get_active_channel (image) != NULL); sel = ! gimp_channel_is_empty (gimp_image_get_mask (image)); indexed = (gimp_image_base_type (image) == GIMP_INDEXED); diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index 835cfd1853..96803c60a7 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -228,7 +228,7 @@ layers_new_cmd_callback (GtkAction *action, /* If there is a floating selection, the new command transforms * the current fs into a new layer */ - if ((floating_sel = gimp_image_floating_sel (image))) + if ((floating_sel = gimp_image_get_floating_selection (image))) { GError *error = NULL; @@ -281,7 +281,7 @@ layers_new_last_vals_cmd_callback (GtkAction *action, /* If there is a floating selection, the new command transforms * the current fs into a new layer */ - if ((floating_sel = gimp_image_floating_sel (image))) + if ((floating_sel = gimp_image_get_floating_selection (image))) { GError *error = NULL; diff --git a/app/actions/select-actions.c b/app/actions/select-actions.c index 70559e6011..9c85c3ce51 100644 --- a/app/actions/select-actions.c +++ b/app/actions/select-actions.c @@ -142,7 +142,7 @@ select_actions_update (GimpActionGroup *group, { drawable = gimp_image_get_active_drawable (image); - fs = (gimp_image_floating_sel (image) != NULL); + fs = (gimp_image_get_floating_selection (image) != NULL); sel = ! gimp_channel_is_empty (gimp_image_get_mask (image)); } diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index fb38022643..fa934fe050 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -1050,7 +1050,7 @@ gimp_drawable_init_src_region (GimpDrawable *drawable, if (gimp_drawable_has_floating_sel (drawable)) { GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable)); - GimpLayer *fs = gimp_image_floating_sel (image); + GimpLayer *fs = gimp_image_get_floating_selection (image); gint off_x, off_y; gint fs_off_x, fs_off_y; gint combine_x, combine_y; @@ -1621,7 +1621,7 @@ gimp_drawable_has_floating_sel (const GimpDrawable *drawable) image = gimp_item_get_image (GIMP_ITEM (drawable)); - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); return (floating_sel && floating_sel->fs.drawable == drawable); } diff --git a/app/core/gimpimage-duplicate.c b/app/core/gimpimage-duplicate.c index 37d10c9b38..57002a1d03 100644 --- a/app/core/gimpimage-duplicate.c +++ b/app/core/gimpimage-duplicate.c @@ -94,7 +94,7 @@ gimp_image_duplicate (GimpImage *image) gimp_image_set_unit (new_image, gimp_image_get_unit (image)); /* Copy floating layer */ - floating_layer = gimp_image_floating_sel (image); + floating_layer = gimp_image_get_floating_selection (image); if (floating_layer) { floating_sel_drawable = floating_layer->fs.drawable; @@ -127,7 +127,7 @@ gimp_image_duplicate (GimpImage *image) if (gimp_image_get_active_layer (image) == layer) active_layer = new_layer; - if (image->floating_sel == layer) + if (gimp_image_get_floating_selection (image) == layer) floating_layer = new_layer; if (floating_sel_drawable == GIMP_DRAWABLE (layer)) diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index 176545a8d5..c7dad3194b 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -76,9 +76,9 @@ gimp_image_merge_visible_layers (GimpImage *image, g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); /* if there's a floating selection, anchor it */ - if (gimp_image_floating_sel (image)) + if (gimp_image_get_floating_selection (image)) { - floating_sel_anchor (image->floating_sel); + floating_sel_anchor (gimp_image_get_floating_selection (image)); had_floating_sel = TRUE; } @@ -149,8 +149,8 @@ gimp_image_flatten (GimpImage *image, gimp_set_busy (image->gimp); /* if there's a floating selection, anchor it */ - if (gimp_image_floating_sel (image)) - floating_sel_anchor (image->floating_sel); + if (gimp_image_get_floating_selection (image)) + floating_sel_anchor (gimp_image_get_floating_selection (image)); for (list = gimp_image_get_layer_iter (image); list; diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c index 188408c896..a6e59089ca 100644 --- a/app/core/gimpimage-quick-mask.c +++ b/app/core/gimpimage-quick-mask.c @@ -85,7 +85,7 @@ gimp_image_set_quick_mask_state (GimpImage *image, { /* if no selection */ - GimpLayer *floating_sel = gimp_image_floating_sel (image); + GimpLayer *floating_sel = gimp_image_get_floating_selection (image); if (floating_sel) floating_sel_to_layer (floating_sel, NULL); @@ -126,7 +126,7 @@ gimp_image_set_quick_mask_state (GimpImage *image, { if (mask) { - GimpLayer *floating_sel = gimp_image_floating_sel (image); + GimpLayer *floating_sel = gimp_image_get_floating_selection (image); gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, _("Disable Quick Mask")); diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index d5ca4e300a..570d7e01c7 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -1616,7 +1616,7 @@ gimp_image_is_empty (const GimpImage *image) } GimpLayer * -gimp_image_floating_sel (const GimpImage *image) +gimp_image_get_floating_selection (const GimpImage *image) { g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); @@ -1685,7 +1685,7 @@ gimp_image_set_component_active (GimpImage *image, if (index != -1 && active != image->active[index]) { - GimpLayer *floating_sel = gimp_image_floating_sel (image); + GimpLayer *floating_sel = gimp_image_get_floating_selection (image); image->active[index] = active ? TRUE : FALSE; @@ -2645,7 +2645,7 @@ gimp_image_set_active_layer (GimpImage *image, gimp_container_have (image->layers, GIMP_OBJECT (layer)), NULL); - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); /* Make sure the floating_sel always is the active layer */ if (floating_sel && layer != floating_sel) @@ -2686,7 +2686,7 @@ gimp_image_set_active_channel (GimpImage *image, GIMP_OBJECT (channel)), NULL); /* Not if there is a floating selection */ - if (channel && gimp_image_floating_sel (image)) + if (channel && gimp_image_get_floating_selection (image)) return NULL; if (channel != image->active_channel) @@ -2919,7 +2919,7 @@ gimp_image_add_layer (GimpImage *image, g_return_val_if_fail (gimp_item_get_image (GIMP_ITEM (layer)) == image, FALSE); - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); active_layer = gimp_image_get_active_layer (image); @@ -2997,7 +2997,7 @@ gimp_image_remove_layer (GimpImage *image, _("Remove Layer")); undo_group = TRUE; - gimp_image_remove_layer (image, gimp_image_floating_sel (image), + gimp_image_remove_layer (image, gimp_image_get_floating_selection (image), TRUE, NULL); } @@ -3008,7 +3008,7 @@ gimp_image_remove_layer (GimpImage *image, old_has_alpha = gimp_image_has_alpha (image); - if (image->floating_sel == layer) + if (gimp_image_get_floating_selection (image) == layer) { undo_desc = _("Remove Floating Selection"); @@ -3037,7 +3037,7 @@ gimp_image_remove_layer (GimpImage *image, gimp_container_remove (image->layers, GIMP_OBJECT (layer)); image->layer_stack = g_slist_remove (image->layer_stack, layer); - if (image->floating_sel == layer) + if (gimp_image_get_floating_selection (image) == layer) { /* If this was the floating selection, reset the fs pointer * and activate the underlying drawable @@ -3335,7 +3335,7 @@ gimp_image_remove_channel (GimpImage *image, _("Remove Channel")); undo_group = TRUE; - gimp_image_remove_layer (image, gimp_image_floating_sel (image), + gimp_image_remove_layer (image, gimp_image_get_floating_selection (image), TRUE, NULL); } diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h index f04a770d6c..3873da805d 100644 --- a/app/core/gimpimage.h +++ b/app/core/gimpimage.h @@ -280,7 +280,7 @@ gint gimp_image_get_height (const GimpImage *image); gboolean gimp_image_has_alpha (const GimpImage *image); gboolean gimp_image_is_empty (const GimpImage *image); -GimpLayer * gimp_image_floating_sel (const GimpImage *image); +GimpLayer * gimp_image_get_floating_selection (const GimpImage *image); void gimp_image_floating_selection_changed (GimpImage *image); GimpChannel * gimp_image_get_mask (const GimpImage *image); diff --git a/app/core/gimplayer-floating-sel.c b/app/core/gimplayer-floating-sel.c index ef39f18eb7..89ab37f1dd 100644 --- a/app/core/gimplayer-floating-sel.c +++ b/app/core/gimplayer-floating-sel.c @@ -65,7 +65,7 @@ floating_sel_attach (GimpLayer *layer, image = gimp_item_get_image (GIMP_ITEM (drawable)); - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); /* If there is already a floating selection, anchor it */ if (floating_sel) diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c index 6ac3ca7022..feb062bb47 100644 --- a/app/core/gimpselection.c +++ b/app/core/gimpselection.c @@ -330,7 +330,7 @@ gimp_selection_boundary (GimpChannel *channel, GimpDrawable *drawable; GimpLayer *layer; - if ((layer = gimp_image_floating_sel (image))) + if ((layer = gimp_image_get_floating_selection (image))) { /* If there is a floating selection, then * we need to do some slightly different boundaries. diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c index 2572ac30b6..294025b40c 100644 --- a/app/display/gimpdisplayshell-layer-select.c +++ b/app/display/gimpdisplayshell-layer-select.c @@ -197,7 +197,7 @@ layer_select_advance (LayerSelect *layer_select, return; /* If there is a floating selection, allow no advancement */ - if (gimp_image_floating_sel (layer_select->image)) + if (gimp_image_get_floating_selection (layer_select->image)) return; current_layer = gimp_image_get_active_layer (layer_select->image); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 7ef9b42852..8e69a6e5f3 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -1635,7 +1635,7 @@ gimp_display_shell_mask_bounds (GimpDisplayShell *shell, g_return_val_if_fail (y2 != NULL, FALSE); /* If there is a floating selection, handle things differently */ - if ((layer = gimp_image_floating_sel (shell->display->image))) + if ((layer = gimp_image_get_floating_selection (shell->display->image))) { gint off_x; gint off_y; diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c index fc881f398d..40fe50ca8b 100644 --- a/app/pdb/image-cmds.c +++ b/app/pdb/image-cmds.c @@ -745,7 +745,7 @@ image_get_floating_sel_invoker (GimpProcedure *procedure, if (success) { - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); } return_vals = gimp_procedure_get_return_values (procedure, success, @@ -774,7 +774,7 @@ image_floating_sel_attached_to_invoker (GimpProcedure *procedure, if (success) { - GimpLayer *floating_sel = gimp_image_floating_sel (image); + GimpLayer *floating_sel = gimp_image_get_floating_selection (image); if (floating_sel) drawable = floating_sel->fs.drawable; diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c index de21dc67e6..c73267d0ba 100644 --- a/app/tools/gimpeditselectiontool.c +++ b/app/tools/gimpeditselectiontool.c @@ -212,7 +212,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool, /* Make a check to see if it should be a floating selection translation */ if ((edit_mode == GIMP_TRANSLATE_MODE_MASK_TO_LAYER || edit_mode == GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER) && - gimp_image_floating_sel (display->image)) + gimp_image_get_floating_selection (display->image)) { edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL; } diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 0ad212c132..d4b119838c 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -849,9 +849,9 @@ gimp_free_select_tool_handle_click (GimpFreeSelectTool *fst, GimpFreeSelectToolPrivate *priv = GET_PRIVATE (fst); /* If there is a floating selection, anchor it */ - if (gimp_image_floating_sel (display->image)) + if (gimp_image_get_floating_selection (display->image)) { - floating_sel_anchor (gimp_image_floating_sel (display->image)); + floating_sel_anchor (gimp_image_get_floating_selection (display->image)); gimp_free_select_tool_halt (fst); } else diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index ed5532341e..97f874e65c 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -285,13 +285,15 @@ gimp_move_tool_button_press (GimpTool *tool, coords->x, coords->y))) { - if (gimp_image_floating_sel (display->image) && + if (gimp_image_get_floating_selection (display->image) && ! gimp_layer_is_floating_sel (layer)) { /* If there is a floating selection, and this aint it, * use the move tool to anchor it. */ - move->floating_layer = gimp_image_floating_sel (display->image); + move->floating_layer = + gimp_image_get_floating_selection (display->image); + gimp_tool_control_activate (tool->control); return; @@ -749,7 +751,7 @@ gimp_move_tool_cursor_update (GimpTool *tool, coords->x, coords->y))) { /* if there is a floating selection, and this aint it... */ - if (gimp_image_floating_sel (display->image) && + if (gimp_image_get_floating_selection (display->image) && ! gimp_layer_is_floating_sel (layer)) { tool_cursor = GIMP_TOOL_CURSOR_MOVE; diff --git a/app/tools/gimprectangleselecttool.c b/app/tools/gimprectangleselecttool.c index 717ce7daee..d95423477f 100644 --- a/app/tools/gimprectangleselecttool.c +++ b/app/tools/gimprectangleselecttool.c @@ -760,9 +760,9 @@ gimp_rectangle_select_tool_execute (GimpRectangleTool *rectangle, gint pressx; gint pressy; - if (gimp_image_floating_sel (image)) + if (gimp_image_get_floating_selection (image)) { - floating_sel_anchor (gimp_image_floating_sel (image)); + floating_sel_anchor (gimp_image_get_floating_selection (image)); gimp_image_flush (image); return TRUE; } diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c index 775632f418..1866c8d511 100644 --- a/app/tools/gimpregionselecttool.c +++ b/app/tools/gimpregionselecttool.c @@ -193,10 +193,10 @@ gimp_region_select_tool_button_release (GimpTool *tool, if (GIMP_SELECTION_TOOL (tool)->function == SELECTION_ANCHOR) { - if (gimp_image_floating_sel (display->image)) + if (gimp_image_get_floating_selection (display->image)) { /* If there is a floating selection, anchor it */ - floating_sel_anchor (gimp_image_floating_sel (display->image)); + floating_sel_anchor (gimp_image_get_floating_selection (display->image)); } else { diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c index c92d56fb7f..d1227fe07e 100644 --- a/app/tools/gimpselectiontool.c +++ b/app/tools/gimpselectiontool.c @@ -174,7 +174,7 @@ gimp_selection_tool_oper_update (GimpTool *tool, drawable = gimp_image_get_active_drawable (display->image); layer = gimp_image_pick_correlate_layer (display->image, coords->x, coords->y); - floating_sel = gimp_image_floating_sel (display->image); + floating_sel = gimp_image_get_floating_selection (display->image); if (drawable) { diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 088cee71b8..0df1c33089 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -1747,13 +1747,13 @@ gimp_text_tool_create_layer (GimpTextTool *text_tool, gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TEXT, _("Add Text Layer")); - if (gimp_image_floating_sel (image)) + if (gimp_image_get_floating_selection (image)) { g_signal_handlers_block_by_func (image, gimp_text_tool_layer_changed, text_tool); - floating_sel_anchor (gimp_image_floating_sel (image)); + floating_sel_anchor (gimp_image_get_floating_selection (image)); g_signal_handlers_unblock_by_func (image, gimp_text_tool_layer_changed, diff --git a/app/widgets/gimpdrawabletreeview.c b/app/widgets/gimpdrawabletreeview.c index 313ffc6167..60a2fce123 100644 --- a/app/widgets/gimpdrawabletreeview.c +++ b/app/widgets/gimpdrawabletreeview.c @@ -174,7 +174,8 @@ gimp_drawable_tree_view_select_item (GimpContainerView *view, if (item_view->image) { - GimpLayer *floating_sel = gimp_image_floating_sel (item_view->image); + GimpLayer *floating_sel = + gimp_image_get_floating_selection (item_view->image); success = (item == NULL || floating_sel == NULL || diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index c0ae2b642e..db196699f4 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -642,7 +642,7 @@ gimp_layer_tree_view_drop_possible (GimpContainerTreeView *tree_view, { GimpImage *dest_image = GIMP_ITEM_TREE_VIEW (tree_view)->image; - if (gimp_image_floating_sel (dest_image)) + if (gimp_image_get_floating_selection (dest_image)) return FALSE; } @@ -858,7 +858,7 @@ gimp_layer_tree_view_floating_selection_changed (GimpImage *image, GimpLayer *floating_sel; GtkTreeIter *iter; - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); if (floating_sel) { diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c index c71a40a921..a6ee37c31d 100644 --- a/app/xcf/xcf-save.c +++ b/app/xcf/xcf-save.c @@ -465,7 +465,7 @@ xcf_save_layer_props (XcfInfo *info, if (layer == gimp_image_get_active_layer (image)) xcf_check_error (xcf_save_prop (info, image, PROP_ACTIVE_LAYER, error)); - if (layer == gimp_image_floating_sel (image)) + if (layer == gimp_image_get_floating_selection (image)) { info->floating_sel_drawable = layer->fs.drawable; xcf_check_error (xcf_save_prop (info, image, PROP_FLOATING_SELECTION, diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index 7809efe3e1..92f1ee7aae 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -1679,7 +1679,7 @@ HELP %invoke = ( code => <<'CODE' { - floating_sel = gimp_image_floating_sel (image); + floating_sel = gimp_image_get_floating_selection (image); } CODE ); @@ -1708,7 +1708,7 @@ HELP %invoke = ( code => <<'CODE' { - GimpLayer *floating_sel = gimp_image_floating_sel (image); + GimpLayer *floating_sel = gimp_image_get_floating_selection (image); if (floating_sel) drawable = floating_sel->fs.drawable;