Commit 5b68a1d0 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

renamed gimp_item_offsets() to gimp_item_get_offset() and

2008-11-03  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpitem.[ch]: renamed
	gimp_item_offsets() to gimp_item_get_offset() and
	gimp_item_set_offsets() to gimp_item_set_offset().

	* app/actions/drawable-commands.c
	* app/actions/layers-commands.c
	* app/core/<many>.c
	* app/display/gimpdisplayshell-dnd.c
	* app/display/gimpdisplayshell-preview.c
	* app/display/gimpdisplayshell-transform.c
	* app/display/gimpdisplayshell.c
	* app/paint/gimppaintcore-stroke.c
	* app/paint/gimppaintcore.c
	* app/paint/gimpsourcecore.c
	* app/text/gimptextlayer-xcf.c
	* app/tools/<many>.c
	* app/widgets/gimptoolbox-dnd.c
	* tools/pdbgen/pdb/drawable.pdb
	* tools/pdbgen/pdb/drawable_transform.pdb
	* tools/pdbgen/pdb/selection.pdb
	* tools/pdbgen/pdb/transform_tools.pdb
	* tools/pdbgen/pdb/vectors.pdb: changed accordingly.

	* app/pdb/drawable-cmds.c
	* app/pdb/drawable-transform-cmds.c
	* app/pdb/selection-cmds.c
	* app/pdb/vectors-cmds.c
	* app/pdb/transform-tools-cmds.c: regenerated.


svn path=/trunk/; revision=27529
parent 594bc84a
2008-11-03 Michael Natterer <mitch@gimp.org>
* app/core/gimpitem.[ch]: renamed
gimp_item_offsets() to gimp_item_get_offset() and
gimp_item_set_offsets() to gimp_item_set_offset().
* app/actions/drawable-commands.c
* app/actions/layers-commands.c
* app/core/<many>.c
* app/display/gimpdisplayshell-dnd.c
* app/display/gimpdisplayshell-preview.c
* app/display/gimpdisplayshell-transform.c
* app/display/gimpdisplayshell.c
* app/paint/gimppaintcore-stroke.c
* app/paint/gimppaintcore.c
* app/paint/gimpsourcecore.c
* app/text/gimptextlayer-xcf.c
* app/tools/<many>.c
* app/widgets/gimptoolbox-dnd.c
* tools/pdbgen/pdb/drawable.pdb
* tools/pdbgen/pdb/drawable_transform.pdb
* tools/pdbgen/pdb/selection.pdb
* tools/pdbgen/pdb/transform_tools.pdb
* tools/pdbgen/pdb/vectors.pdb: changed accordingly.
* app/pdb/drawable-cmds.c
* app/pdb/drawable-transform-cmds.c
* app/pdb/selection-cmds.c
* app/pdb/vectors-cmds.c
* app/pdb/transform-tools-cmds.c: regenerated.
2008-11-02 Martin Nordholts <martinn@svn.gnome.org>
* app/core/gimpitem.c (gimp_item_set_offsets): New function that
......
......@@ -210,7 +210,7 @@ drawable_flip_cmd_callback (GtkAction *action,
item = GIMP_ITEM (drawable);
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
switch ((GimpOrientationType) value)
{
......@@ -260,7 +260,7 @@ drawable_rotate_cmd_callback (GtkAction *action,
item = GIMP_ITEM (drawable);
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
center_x = ((gdouble) off_x + (gdouble) gimp_item_width (item) / 2.0);
center_y = ((gdouble) off_y + (gdouble) gimp_item_height (item) / 2.0);
......
......@@ -300,7 +300,7 @@ layers_new_last_vals_cmd_callback (GtkAction *action,
{
GimpLayer *template = GIMP_LAYER (GIMP_ACTION (action)->viewable);
gimp_item_offsets (GIMP_ITEM (template), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (template), &off_x, &off_y);
width = gimp_item_width (GIMP_ITEM (template));
height = gimp_item_height (GIMP_ITEM (template));
opacity = gimp_layer_get_opacity (template);
......@@ -515,7 +515,7 @@ layers_text_to_vectors_cmd_callback (GtkAction *action,
vectors = gimp_text_vectors_new (image, GIMP_TEXT_LAYER (layer)->text);
gimp_item_offsets (GIMP_ITEM (layer), &x, &y);
gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
gimp_image_add_vectors (image, vectors, -1, TRUE);
......@@ -641,7 +641,7 @@ layers_crop_cmd_callback (GtkAction *action,
return;
}
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
off_x -= x1;
off_y -= y1;
......@@ -783,7 +783,7 @@ layers_mask_to_selection_cmd_callback (GtkAction *action,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (mask), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (mask), &off_x, &off_y);
gimp_channel_select_channel (gimp_image_get_mask (image),
_("Layer Mask to Selection"),
......
......@@ -203,7 +203,7 @@ gimp_edit_paste (GimpImage *image,
gint paste_width, paste_height;
gboolean have_mask;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
have_mask = gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
if (! have_mask &&
......
......@@ -429,7 +429,7 @@ gimp_channel_select_alpha (GimpChannel *channel,
gimp_channel_all (add_on, FALSE);
}
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_channel_select_channel (channel, _("Alpha to Selection"), add_on,
off_x, off_y,
......@@ -515,7 +515,7 @@ gimp_channel_select_fuzzy (GimpChannel *channel,
x, y);
if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_channel_select_channel (channel, C_("command", "Fuzzy Select"),
add_on, add_on_x, add_on_y,
......@@ -562,7 +562,7 @@ gimp_channel_select_by_color (GimpChannel *channel,
color);
if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_channel_select_channel (channel, C_("command", "Select by Color"),
add_on, add_on_x, add_on_y,
......
......@@ -721,7 +721,7 @@ gimp_channel_stroke (GimpItem *item,
return FALSE;
}
gimp_item_offsets (GIMP_ITEM (channel), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (channel), &offset_x, &offset_y);
switch (stroke_options->method)
{
......
......@@ -592,7 +592,7 @@ gradient_precalc_shapeburst (GimpImage *image,
gint offx, offy;
gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
gimp_item_offsets (GIMP_ITEM (drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (drawable), &offx, &offy);
pixel_region_init (&maskR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
x1 + offx, y1 + offy, (x2 - x1), (y2 - y1), FALSE);
......
......@@ -200,7 +200,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
gint off_y = 0;
if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_channel_combine_mask (mask, gimp_image_get_mask (image),
GIMP_CHANNEL_OP_INTERSECT,
......@@ -218,7 +218,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
item = GIMP_ITEM (drawable);
/* Limit the channel bounds to the drawable's extents */
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
x1 = CLAMP (x1, off_x, (off_x + gimp_item_width (item)));
y1 = CLAMP (y1, off_y, (off_y + gimp_item_height (item)));
......
......@@ -79,7 +79,7 @@ gimp_drawable_real_apply_region (GimpDrawable *drawable,
}
/* get the layer offsets */
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
/* make sure the image application coordinates are within drawable bounds */
x1 = CLAMP (x, 0, gimp_item_width (item));
......@@ -228,7 +228,7 @@ gimp_drawable_real_replace_region (GimpDrawable *drawable,
}
/* get the layer offsets */
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
/* make sure the image application coordinates are within drawable bounds */
x1 = CLAMP (x, 0, gimp_item_width (item));
......
......@@ -94,7 +94,7 @@ gimp_drawable_foreground_extract_siox_init (GimpDrawable *drawable,
if (gimp_image_base_type (image) == GIMP_INDEXED)
colormap = gimp_image_get_colormap (image);
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
intersect = gimp_rectangle_intersect (offset_x, offset_y,
gimp_item_width (GIMP_ITEM (drawable)),
......
......@@ -62,7 +62,7 @@ gimp_drawable_calculate_histogram (GimpDrawable *drawable,
image = gimp_item_get_image (GIMP_ITEM (drawable));
sel_mask = gimp_image_get_mask (image);
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
pixel_region_init (&mask,
gimp_drawable_get_tiles (GIMP_DRAWABLE (sel_mask)),
x1 + off_x, y1 + off_y, (x2 - x1), (y2 - y1), FALSE);
......
......@@ -379,7 +379,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
color_region (&maskPR, bg);
/* render the stroke into it */
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_scan_convert_render (scan_convert, mask,
x + off_x, y + off_y,
......
......@@ -555,7 +555,7 @@ gimp_drawable_flip (GimpItem *item,
gint off_x, off_y;
gint old_off_x, old_off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tile_manager_get_offsets (gimp_drawable_get_tiles (drawable),
&old_off_x, &old_off_y);
......@@ -590,7 +590,7 @@ gimp_drawable_rotate (GimpItem *item,
gint off_x, off_y;
gint old_off_x, old_off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tile_manager_get_offsets (gimp_drawable_get_tiles (drawable),
&old_off_x, &old_off_y);
......@@ -627,7 +627,7 @@ gimp_drawable_transform (GimpItem *item,
gint off_x, off_y;
gint old_off_x, old_off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tile_manager_get_offsets (gimp_drawable_get_tiles (drawable),
&old_off_x, &old_off_y);
......@@ -1057,7 +1057,7 @@ gimp_drawable_set_tiles (GimpDrawable *drawable,
if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
push_undo = FALSE;
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_drawable_set_tiles_full (drawable, push_undo, undo_desc, tiles,
gimp_drawable_type (drawable),
......@@ -1340,7 +1340,7 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
{
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tmp_x1 = CLAMP (tmp_x1 - off_x, 0, gimp_item_width (item));
tmp_y1 = CLAMP (tmp_y1 - off_y, 0, gimp_item_height (item));
......@@ -1395,7 +1395,7 @@ gimp_drawable_mask_intersect (GimpDrawable *drawable,
{
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
retval = gimp_rectangle_intersect (tmp_x - off_x, tmp_y - off_y,
tmp_width - tmp_x, tmp_height - tmp_y,
......
......@@ -396,7 +396,7 @@ gimp_drawable_stack_drawable_update (GimpItem *item,
gint offset_x;
gint offset_y;
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_drawable_stack_update (stack,
x + offset_x, y + offset_y,
......@@ -411,7 +411,7 @@ gimp_drawable_stack_drawable_visible (GimpItem *item,
gint offset_x;
gint offset_y;
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_drawable_stack_update (stack,
offset_x, offset_y,
......
......@@ -259,7 +259,7 @@ compute_offset (GObject *object,
/* fall back on using the offsets instead */
GimpItem *item = GIMP_ITEM (object);
gimp_item_offsets (item, &object_offset_x, &object_offset_y);
gimp_item_get_offset (item, &object_offset_x, &object_offset_y);
object_height = gimp_item_height (item);
object_width = gimp_item_width (item);
}
......@@ -293,7 +293,7 @@ compute_offset (GObject *object,
}
else
{
gimp_item_offsets (item, &object_offset_x, &object_offset_y);
gimp_item_get_offset (item, &object_offset_x, &object_offset_y);
object_height = gimp_item_height (item);
object_width = gimp_item_width (item);
}
......
......@@ -1173,7 +1173,7 @@ generate_histogram_rgb (CFHistogram histogram,
gint count = 0;
gboolean has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* g_printerr ("col_limit = %d, nfc = %d\n", col_limit, num_found_cols); */
......@@ -2770,7 +2770,7 @@ median_cut_pass2_no_dither_gray (QuantizeObj *quantobj,
gint offsetx, offsety;
gpointer pr;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
......@@ -2867,7 +2867,7 @@ median_cut_pass2_fixed_dither_gray (QuantizeObj *quantobj,
gint offsetx, offsety;
gpointer pr;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
......@@ -3018,7 +3018,7 @@ median_cut_pass2_no_dither_rgb (QuantizeObj *quantobj,
gint nth_layer = quantobj->nth_layer;
gint n_layers = quantobj->n_layers;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* In the case of web/mono palettes, we actually force
* grayscale drawables through the rgb pass2 functions
......@@ -3143,7 +3143,7 @@ median_cut_pass2_fixed_dither_rgb (QuantizeObj *quantobj,
gint nth_layer = quantobj->nth_layer;
gint n_layers = quantobj->n_layers;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* In the case of web/mono palettes, we actually force
* grayscale drawables through the rgb pass2 functions
......@@ -3346,7 +3346,7 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
gint lastblue = -1;
gint offsetx, offsety;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
......@@ -3560,7 +3560,7 @@ median_cut_pass2_fs_dither_gray (QuantizeObj *quantobj,
gint width, height;
gulong *index_used_count = quantobj->index_used_count;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
......@@ -3820,7 +3820,7 @@ median_cut_pass2_fs_dither_rgb (QuantizeObj *quantobj,
gint nth_layer = quantobj->nth_layer;
gint n_layers = quantobj->n_layers;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* In the case of web/mono palettes, we actually force
* grayscale drawables through the rgb pass2 functions
......
......@@ -110,7 +110,7 @@ gimp_image_crop (GimpImage *image,
layer = gimp_image_get_active_layer (image);
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
off_x -= x1;
off_y -= y1;
......@@ -185,7 +185,7 @@ gimp_image_crop (GimpImage *image,
gint off_x, off_y;
gint lx1, ly1, lx2, ly2;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
lx1 = CLAMP (off_x, 0, gimp_image_get_width (image));
ly1 = CLAMP (off_y, 0, gimp_image_get_height (image));
......
......@@ -344,7 +344,7 @@ gimp_image_merge_layers (GimpImage *image,
{
layer = merge_list->data;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
switch (merge_type)
{
......@@ -525,7 +525,7 @@ gimp_image_merge_layers (GimpImage *image,
return NULL;
}
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
x3 = CLAMP (off_x, x1, x2);
y3 = CLAMP (off_y, y1, y2);
......
......@@ -65,7 +65,7 @@ gimp_image_pick_color (GimpImage *image,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x -= off_x;
y -= off_y;
......
......@@ -154,7 +154,7 @@ gimp_image_resize_with_layers (GimpImage *image,
gint old_offset_x;
gint old_offset_y;
gimp_item_offsets (item, &old_offset_x, &old_offset_y);
gimp_item_get_offset (item, &old_offset_x, &old_offset_y);
gimp_item_translate (item, offset_x, offset_y, TRUE);
......
......@@ -175,7 +175,7 @@ gimp_image_rotate (GimpImage *image,
gint off_x;
gint off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
gimp_item_rotate (item, context, rotate_type, center_x, center_y, FALSE);
......@@ -256,7 +256,7 @@ gimp_image_rotate_item_offset (GimpImage *image,
return;
}
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
x -= off_x;
y -= off_y;
......
......@@ -3065,7 +3065,7 @@ gimp_image_add_layers (GimpImage *image,
GimpItem *item = GIMP_ITEM (list->data);
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
layers_x = MIN (layers_x, off_x);
layers_y = MIN (layers_y, off_y);
......@@ -3687,7 +3687,7 @@ gimp_image_pick_correlate_layer (const GimpImage *image,
GimpLayer *layer = list->data;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (layer),
x - off_x, y - off_y) > 63)
......@@ -3729,7 +3729,7 @@ gimp_image_coords_in_active_pickable (GimpImage *image,
gint off_x, off_y;
gint d_x, d_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
d_x = x - off_x;
d_y = y - off_y;
......
......@@ -693,7 +693,7 @@ gimp_item_height (const GimpItem *item)
}
/**
* gimp_item_offsets:
* gimp_item_get_offsets:
* @item: The #GimpItem to check.
* @offset_x: Return location for the item's X offset.
* @offset_y: Return location for the item's Y offset.
......@@ -701,9 +701,9 @@ gimp_item_height (const GimpItem *item)
* Reveals the X and Y offsets of the item.
*/
void
gimp_item_offsets (const GimpItem *item,
gint *offset_x,
gint *offset_y)
gimp_item_get_offset (const GimpItem *item,
gint *offset_x,
gint *offset_y)
{
g_return_if_fail (GIMP_IS_ITEM (item));
......@@ -712,9 +712,9 @@ gimp_item_offsets (const GimpItem *item,
}
void
gimp_item_set_offsets (GimpItem *item,
gint offset_x,
gint offset_y)
gimp_item_set_offset (GimpItem *item,
gint offset_x,
gint offset_y)
{
g_return_if_fail (GIMP_IS_ITEM (item));
......
......@@ -159,10 +159,11 @@ gboolean gimp_item_rename (GimpItem *item,
gint gimp_item_width (const GimpItem *item);
gint gimp_item_height (const GimpItem *item);
void gimp_item_offsets (const GimpItem *item,
void gimp_item_get_offset (const GimpItem *item,
gint *offset_x,
gint *offset_y);
void gimp_item_set_offsets (GimpItem *item,
void gimp_item_set_offset (GimpItem *item,
gint offset_x,
gint offset_y);
......
......@@ -115,9 +115,9 @@ gimp_item_prop_undo_constructor (GType type,
break;
case GIMP_UNDO_ITEM_DISPLACE:
gimp_item_offsets (item,
&item_prop_undo->offset_x,
&item_prop_undo->offset_y);
gimp_item_get_offset (item,
&item_prop_undo->offset_x,
&item_prop_undo->offset_y);
break;
case GIMP_UNDO_ITEM_VISIBILITY:
......@@ -225,7 +225,7 @@ gimp_item_prop_undo_pop (GimpUndo *undo,
gint offset_x;
gint offset_y;
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_item_translate (item,
item_prop_undo->offset_x - offset_x,
......
......@@ -278,7 +278,7 @@ floating_sel_store (GimpLayer *layer,
* drawable that this floating selection obscures. We do this so
* that it will be possible to subsequently restore the drawable's area
*/
gimp_item_offsets (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
/* Find the minimum area we need to uncover -- in image space */
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
......@@ -328,7 +328,7 @@ floating_sel_restore (GimpLayer *layer,
*/
/* Find the minimum area we need to uncover -- in image space */
gimp_item_offsets (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
......@@ -437,7 +437,7 @@ floating_sel_composite (GimpLayer *layer,
gint x1, y1, x2, y2;
/* Find the minimum area we need to composite -- in image space */
gimp_item_offsets (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
......@@ -514,7 +514,7 @@ floating_sel_boundary (GimpLayer *layer,
width = gimp_item_width (GIMP_ITEM (layer));
height = gimp_item_height (GIMP_ITEM (layer));
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
if (layer->fs.segs)
g_free (layer->fs.segs);
......
......@@ -1825,7 +1825,7 @@ gimp_layer_resize_to_image (GimpLayer *layer,
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
_("Layer to Image Size"));
gimp_item_offsets (GIMP_ITEM (layer), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
gimp_item_resize (GIMP_ITEM (layer), context,
gimp_image_get_width (image),
gimp_image_get_height (image),
......