[gimp-gap/gap-2-8] Ported all plug-ins to the new object API from GIMP 2.8
- From: Alexandre Prokoudine <aprokoudine src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-gap/gap-2-8] Ported all plug-ins to the new object API from GIMP 2.8
- Date: Tue, 14 May 2013 21:03:04 +0000 (UTC)
commit 35e1e51e81d377c6f58e051616e8a914fc9dc35e
Author: Alexandre Prokoudine <alexandre prokoudine gmail com>
Date: Wed May 15 00:55:12 2013 +0400
Ported all plug-ins to the new object API from GIMP 2.8
gap/gap_blend_fill_main.c | 2 +-
gap/gap_bluebox.c | 4 +-
gap/gap_colormask_exec.c | 2 +-
gap/gap_edge_detection.c | 6 +-
gap/gap_fg_matting_exec.c | 4 +-
gap/gap_fire_pattern.c | 12 +-
gap/gap_image.c | 8 +-
gap/gap_layer_copy.c | 6 +-
gap/gap_morph_dialog.c | 2 +-
gap/gap_morph_exec.c | 9 +-
gap/gap_mov_exec.c | 12 +-
gap/gap_mov_render.c | 8 +-
gap/gap_onion_base.c | 2 +-
gap/gap_player_dialog.c | 6 +-
gap/gap_pview_da.c | 4 +-
gap/gap_range_ops.c | 6 +-
gap/gap_split.c | 4 +-
gap/gap_story_att_trans_dlg.c | 22 ++--
gap/gap_story_render_processor.c | 8 +-
gap/gap_vex_exec.c | 4 +-
gap/gap_water_pattern.c | 10 +-
gap/sel-to-anim-img.scm | 2 +-
libgapvidapi/gap_vid_api.c | 6 +-
po/Makefile.in.in | 222 +-------------------------------------
24 files changed, 77 insertions(+), 294 deletions(-)
---
diff --git a/gap/gap_blend_fill_main.c b/gap/gap_blend_fill_main.c
index 34dfa68..d37162e 100644
--- a/gap/gap_blend_fill_main.c
+++ b/gap/gap_blend_fill_main.c
@@ -1255,7 +1255,7 @@ p_create_workLayer(FilterContext *context)
, 100.0 /* full opacity */
, 0 /* normal mode */
);
- gimp_image_add_layer(context->imageId, context->workLayerId, 0);
+ gimp_image_insert_layer(context->imageId, context->workLayerId, 0, 0);
gimp_layer_set_offsets(context->workLayerId
, context->workLayerOffsX
, context->workLayerOffsY
diff --git a/gap/gap_bluebox.c b/gap/gap_bluebox.c
index 4da571d..79ca662 100644
--- a/gap/gap_bluebox.c
+++ b/gap/gap_bluebox.c
@@ -1617,7 +1617,7 @@ gap_bluebox_apply(GapBlueboxGlobalParams *bbp)
,100.0 /* Opacity full opaque */
,GIMP_NORMAL_MODE
);
- gimp_image_add_layer(bbp->pv_image_id, bbp->pv_layer_id, 0);
+ gimp_image_insert_layer(bbp->pv_image_id, bbp->pv_layer_id, 0, 0);
gimp_layer_set_offsets(bbp->pv_layer_id, 0, 0);
if(!gimp_drawable_has_alpha(bbp->pv_layer_id))
@@ -1646,7 +1646,7 @@ gap_bluebox_apply(GapBlueboxGlobalParams *bbp)
,100.0 /* Opacity full opaque */
,GIMP_NORMAL_MODE
);
- gimp_image_add_layer(bbp->pv_image_id, bbp->pv_master_layer_id, 1);
+ gimp_image_insert_layer(bbp->pv_image_id, bbp->pv_master_layer_id, 0, 1);
if(!gimp_drawable_has_alpha(bbp->pv_master_layer_id))
{
diff --git a/gap/gap_colormask_exec.c b/gap/gap_colormask_exec.c
index 63d3cb3..63a309c 100644
--- a/gap/gap_colormask_exec.c
+++ b/gap/gap_colormask_exec.c
@@ -333,7 +333,7 @@ p_create_empty_layer(gint32 image_id
, 0 /* normal mode */
);
- gimp_image_add_layer (image_id, layer_id, 0 /* stackposition */ );
+ gimp_image_insert_layer (image_id, layer_id, 0, 0 /* stackposition */ );
return (layer_id);
diff --git a/gap/gap_edge_detection.c b/gap/gap_edge_detection.c
index f37a808..0cf62ae 100644
--- a/gap/gap_edge_detection.c
+++ b/gap/gap_edge_detection.c
@@ -372,7 +372,7 @@ p_createEmptyEdgeDrawable(GapEdgeContext *ectx)
, 0 /* normal mode */
);
- gimp_image_add_layer (ectx->edgeImageId, ectx->edgeDrawableId, 0 /* stackposition */ );
+ gimp_image_insert_layer (ectx->edgeImageId, ectx->edgeDrawableId, 0, 0 /* stackposition */ );
ectx->edgeDrawable = gimp_drawable_get(ectx->edgeDrawableId);
@@ -756,7 +756,7 @@ gint32 gap_edgeDetection(gint32 refDrawableId
imageId = gimp_drawable_get_image(activeDrawableId);
edgeLayerId = gimp_layer_copy(activeDrawableId);
- gimp_image_add_layer (imageId, edgeLayerId, 0 /* stackposition */ );
+ gimp_image_insert_layer (imageId, edgeLayerId, 0, 0 /* stackposition */ );
edgeDrawable = gimp_drawable_get(edgeLayerId);
refDrawable = gimp_drawable_get(activeDrawableId);
@@ -768,7 +768,7 @@ gint32 gap_edgeDetection(gint32 refDrawableId
blurDrawable = NULL;
// blurLayerId = gimp_layer_copy(edgeLayerId);
-// gimp_image_add_layer (imageId, blurLayerId, 0 /* stackposition */ );
+// gimp_image_add_layer (imageId, blurLayerId, 0, 0 /* stackposition */ );
// blurDrawable = gimp_drawable_get(blurLayerId);
p_subtract_ref_layer(imageId, edgeDrawable, refDrawable, threshold, shift, invert);
diff --git a/gap/gap_fg_matting_exec.c b/gap/gap_fg_matting_exec.c
index 514ca48..6e355d3 100644
--- a/gap/gap_fg_matting_exec.c
+++ b/gap/gap_fg_matting_exec.c
@@ -270,7 +270,7 @@ p_tri_map_preprocessing (GimpDrawable *drawable, GapFgExtractValues *fgValPtr, g
gimp_drawable_offsets (drawable->drawable_id, &offset_x, &offset_y);
/* add dummy layer (of same size at same offsets) to the same image */
- gimp_image_add_layer(imageId, *dummyLayerId, -1 /* stackposition */ );
+ gimp_image_insert_layer(imageId, *dummyLayerId, 0, -1 /* stackposition */ );
gimp_layer_set_offsets(*dummyLayerId, offset_x, offset_y);
/* create a new layermask (black is full transparent */
@@ -354,7 +354,7 @@ gap_drawable_foreground_extract (GimpDrawable *drawable,
gimp_drawable_offsets (drawable->drawable_id, &offset_x, &offset_y);
/* add resulting layer (of same size at same offsets) to the same image */
- gimp_image_add_layer(imageId, resultLayerId, -1 /* stackposition */ );
+ gimp_image_insert_layer(imageId, resultLayerId, 0, -1 /* stackposition */ );
gimp_layer_set_offsets(resultLayerId, offset_x, offset_y);
/* perform the foreground extraction */
diff --git a/gap/gap_fire_pattern.c b/gap/gap_fire_pattern.c
index 9caef1e..741c1f0 100644
--- a/gap/gap_fire_pattern.c
+++ b/gap/gap_fire_pattern.c
@@ -811,8 +811,8 @@ p_init_context_and_cloud_and_shape_layers(gint32 drawable_id, firepattern_val_t
, 100.0 /* full opaque */
, GIMP_NORMAL_MODE /* 0 */
);
- gimp_image_add_layer(ctxt->ref_image_id, cuvals->fireShapeLayer, -1);
- gimp_image_add_layer(ctxt->ref_image_id, cuvals->cloudLayer1, -1);
+ gimp_image_insert_layer(ctxt->ref_image_id, cuvals->fireShapeLayer, 0, -1);
+ gimp_image_insert_layer(ctxt->ref_image_id, cuvals->cloudLayer1, 0, -1);
/* Adds the solid noise */
@@ -1128,7 +1128,7 @@ p_run_renderFirePattern(gint32 drawable_id, firepattern_val_t *cuvals, firepatte
* copy the drawable to a new layer in this new image
*/
templayer_id = gimp_layer_new_from_drawable(drawable_id, ctxt->image_id);
- gimp_image_add_layer(ctxt->image_id, templayer_id, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, templayer_id, 0, -1 /* -1 place above active layer */);
}
/* copy cloud layers from ref image to current processed image_id
@@ -1147,16 +1147,16 @@ p_run_renderFirePattern(gint32 drawable_id, firepattern_val_t *cuvals, firepatte
, 100.0 /* full opaque */
, GIMP_NORMAL_MODE /* 0 */
);
- gimp_image_add_layer(ctxt->image_id, newlayer2_id, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, newlayer2_id, 0, -1 /* -1 place above active layer */);
p_render_fireshape_layer(ctxt, cuvals, newlayer2_id);
}
else
{
newlayer2_id = gimp_layer_new_from_drawable(cuvals->fireShapeLayer, ctxt->image_id);
- gimp_image_add_layer(ctxt->image_id, newlayer2_id, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, newlayer2_id, 0, -1 /* -1 place above active layer */);
}
- gimp_image_add_layer(ctxt->image_id, newlayer1_id, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, newlayer1_id, 0, -1 /* -1 place above active layer */);
p_cloud_size_check(newlayer1_id, ctxt);
p_shape_size_check(newlayer2_id, ctxt);
diff --git a/gap/gap_image.c b/gap/gap_image.c
index 794748a..5bc9747 100644
--- a/gap/gap_image.c
+++ b/gap/gap_image.c
@@ -102,13 +102,13 @@ gap_image_merge_visible_layers(gint32 image_id, GimpMergeType mergemode)
l_width, l_height, l_type,
0.0, /* Opacity full transparent */
0); /* NORMAL */
- gimp_image_add_layer(image_id, l_layer_id, 0);
+ gimp_image_insert_layer(image_id, l_layer_id, 0, 0);
l_layer_id = gimp_layer_new(image_id, "dummy",
10, 10, l_type,
0.0, /* Opacity full transparent */
0); /* NORMAL */
- gimp_image_add_layer(image_id, l_layer_id, 0);
+ gimp_image_insert_layer(image_id, l_layer_id, 0, 0);
return gimp_image_merge_visible_layers (image_id, mergemode);
} /* end gap_image_merge_visible_layers */
@@ -152,7 +152,7 @@ void gap_image_prevent_empty_image(gint32 image_id)
l_width, l_height, l_type,
0.0, /* Opacity full transparent */
0); /* NORMAL */
- gimp_image_add_layer(image_id, l_layer_id, 0);
+ gimp_image_insert_layer(image_id, l_layer_id, 0, 0);
}
} /* end gap_image_prevent_empty_image */
@@ -195,7 +195,7 @@ gap_image_new_with_layer_of_samesize(gint32 old_image_id, gint32 *layer_id)
l_width, l_height, l_type,
0.0, /* Opacity full transparent */
0); /* NORMAL */
- gimp_image_add_layer(new_image_id, *layer_id, 0);
+ gimp_image_insert_layer(new_image_id, *layer_id, 0, 0);
}
return (new_image_id);
diff --git a/gap/gap_layer_copy.c b/gap/gap_layer_copy.c
index cff3b90..1156b13 100644
--- a/gap/gap_layer_copy.c
+++ b/gap/gap_layer_copy.c
@@ -170,7 +170,7 @@ gap_layer_copy_to_image (gint32 dst_image_id, gint32 src_layer_id)
}
/* add the copied layer to destination dst_image_id (0 == on top of layerstack) */
- gimp_image_add_layer(dst_image_id, l_new_layer_id, 0);
+ gimp_image_insert_layer(dst_image_id, l_new_layer_id, 0, 0);
gimp_layer_set_offsets(l_new_layer_id, l_src_offset_x, l_src_offset_y);
return l_new_layer_id; /* all done OK */
@@ -494,7 +494,7 @@ gap_layer_copy_picked_channel (gint32 dst_drawable_id, guint dst_channel_pick
* create a new RGB or RGBA layer for the image with image_id
* and init with supplied data.
* The caller is responsible to add the returned layer
- * to the image ( by calling gimp_image_add_layer )
+ * to the image ( by calling gimp_image_insert_layer )
*
* return layer_id or -1 in case of errors
*/
@@ -785,7 +785,7 @@ gap_layer_make_duplicate(gint32 src_layer_id, gint32 image_id
/* and add at stackposition above src_layer */
l_stackposition = gap_layer_get_stackposition(image_id, src_layer_id);
- gimp_image_add_layer (image_id, l_new_layer_id, l_stackposition);
+ gimp_image_insert_layer (image_id, l_new_layer_id, 0, l_stackposition);
/* build name with optional prefix and/or suffix */
l_suffix = "\0";
diff --git a/gap/gap_morph_dialog.c b/gap/gap_morph_dialog.c
index 3b97bda..64342e6 100644
--- a/gap/gap_morph_dialog.c
+++ b/gap/gap_morph_dialog.c
@@ -1780,7 +1780,7 @@ p_render_zoomed_pview(GapMorphSubWin *swp)
, 100.0 /* full opaque */
, GIMP_NORMAL_MODE
);
- gimp_image_add_layer (tmp_image_id, tmp_layer_id, 0);
+ gimp_image_insert_layer (tmp_image_id, tmp_layer_id, 0, 0);
/* copy the visible region to temp_layer_id */
{
diff --git a/gap/gap_morph_exec.c b/gap/gap_morph_exec.c
index a94e7d5..849eb70 100644
--- a/gap/gap_morph_exec.c
+++ b/gap/gap_morph_exec.c
@@ -2116,7 +2116,7 @@ p_mix_layers (gint32 curr_image_id
}
- gimp_image_add_layer(curr_image_id, dst_layer_id, 0);
+ gimp_image_insert_layer(curr_image_id, dst_layer_id, 0, 0);
dst_drawable = gimp_drawable_get (dst_layer_id);
@@ -2360,7 +2360,7 @@ p_create_morph_tween_frame(gint32 total_steps
, GIMP_NORMAL_MODE
);
}
- gimp_image_add_layer(curr_image_id, bg_layer_id, 0);
+ gimp_image_insert_layer(curr_image_id, bg_layer_id, 0, 0);
/* add empty TOP layer */
curr_opacity = p_linear_advance((gdouble)total_steps
@@ -2388,7 +2388,7 @@ p_create_morph_tween_frame(gint32 total_steps
, GIMP_NORMAL_MODE
);
}
- gimp_image_add_layer(curr_image_id, top_layer_id, 0);
+ gimp_image_insert_layer(curr_image_id, top_layer_id, 0, 0);
if(!mgpp->render_mode == GAP_MORPH_RENDER_MODE_WARP)
@@ -2849,8 +2849,9 @@ gap_morph_execute(GapMorphGlobalParams *mgpp)
,&l_src_offset_x
,&l_src_offset_y
);
- gimp_image_add_layer(dst_image_id
+ gimp_image_insert_layer(dst_image_id
, cp_layer_id
+ , 0
, dst_stack_position
);
}
diff --git a/gap/gap_mov_exec.c b/gap/gap_mov_exec.c
index af62297..600143f 100644
--- a/gap/gap_mov_exec.c
+++ b/gap/gap_mov_exec.c
@@ -175,7 +175,7 @@ p_add_tween_and_trace(gint32 dest_image_id, GapMovData *mov_ptr, GapMovCurrent *
);
/* add the layer to the destination image */
- gimp_image_add_layer (dest_image_id, l_new_layer_id, mov_ptr->val_ptr->dst_layerstack +1);
+ gimp_image_insert_layer (dest_image_id, l_new_layer_id, 0, mov_ptr->val_ptr->dst_layerstack +1);
/* keep the trace_layer for all further move path processing steps */
}
@@ -206,7 +206,7 @@ p_add_tween_and_trace(gint32 dest_image_id, GapMovData *mov_ptr, GapMovCurrent *
);
/* add the layer to the destination image */
- gimp_image_add_layer (dest_image_id, l_new_layer_id, mov_ptr->val_ptr->dst_layerstack +1);
+ gimp_image_insert_layer (dest_image_id, l_new_layer_id, 0, mov_ptr->val_ptr->dst_layerstack +1);
if((mov_ptr->val_ptr->trace_image_id >= 0)
&& (mov_ptr->val_ptr->trace_layer_id >= 0))
@@ -329,7 +329,7 @@ p_mov_call_render(GapMovData *mov_ptr, GapMovCurrent *cur_ptr, gint apv_layersta
);
/* add the layer to the anim preview multilayer image */
- gimp_image_add_layer (mov_ptr->val_ptr->tween_image_id, l_new_layer_id, 0 /* top of layerstack */ );
+ gimp_image_insert_layer (mov_ptr->val_ptr->tween_image_id, l_new_layer_id, 0, 0 /* top of layerstack
*/ );
}
}
else
@@ -467,7 +467,7 @@ p_mov_call_render(GapMovData *mov_ptr, GapMovCurrent *cur_ptr, gint apv_layersta
((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
100.0, /* Opacity full opaque */
0); /* NORMAL */
- gimp_image_add_layer(l_tmp_image_id, l_layer_id, 0);
+ gimp_image_insert_layer(l_tmp_image_id, l_layer_id, 0, 0);
gimp_layer_set_offsets(l_layer_id, -1, -1);
l_layer_id = gimp_image_flatten(l_tmp_image_id);
}
@@ -501,7 +501,7 @@ p_mov_call_render(GapMovData *mov_ptr, GapMovCurrent *cur_ptr, gint apv_layersta
);
/* add the layer to the anim preview multilayer image */
- gimp_image_add_layer (mov_ptr->val_ptr->apv_mlayer_image, l_new_layer_id, apv_layerstack);
+ gimp_image_insert_layer (mov_ptr->val_ptr->apv_mlayer_image, l_new_layer_id, 0, apv_layerstack);
}
}
else l_rc = -1;
@@ -1650,7 +1650,7 @@ p_duplicate_layer(gint32 layerId)
imageId = gimp_drawable_get_image(layerId);
gimp_image_set_active_layer(imageId, layerId);
dupLayerId = gimp_layer_copy(layerId);
- gimp_image_add_layer(imageId, dupLayerId, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(imageId, dupLayerId, 0, -1 /* -1 place above active layer */);
return(dupLayerId);
diff --git a/gap/gap_mov_render.c b/gap/gap_mov_render.c
index ea49cb8..3c99d4a 100644
--- a/gap/gap_mov_render.c
+++ b/gap/gap_mov_render.c
@@ -151,7 +151,7 @@ p_mov_selection_handling(gint32 orig_layer_id
GIMP_RGBA_IMAGE,
100.0, /* full opaque */
GIMP_NORMAL_MODE);
- gimp_image_add_layer(val_ptr->tmpsel_image_id, l_tmp_layer_id, 0);
+ gimp_image_insert_layer(val_ptr->tmpsel_image_id, l_tmp_layer_id, 0, 0);
gimp_layer_set_offsets(l_tmp_layer_id, src_offset_x, src_offset_y);
gimp_selection_none(val_ptr->tmpsel_image_id);
@@ -796,7 +796,7 @@ gap_mov_render_render(gint32 image_id, GapMovValues *val_ptr, GapMovCurrent *cur
cur_ptr->processedLayerId = -1;
return -1;
}
- gimp_image_add_layer(image_id, l_cp_layer_id, val_ptr->dst_layerstack);
+ gimp_image_insert_layer(image_id, l_cp_layer_id, 0, val_ptr->dst_layerstack);
}
@@ -853,7 +853,7 @@ gap_mov_render_render(gint32 image_id, GapMovValues *val_ptr, GapMovCurrent *cur
return -1;
}
- gimp_image_add_layer(image_id, l_cp_layer_id,
+ gimp_image_insert_layer(image_id, l_cp_layer_id, 0,
val_ptr->dst_layerstack);
if(gap_debug)
{
@@ -1106,7 +1106,7 @@ gap_mov_render_render(gint32 image_id, GapMovValues *val_ptr, GapMovCurrent *cur
&l_src_offset_x,
&l_src_offset_y);
- gimp_image_add_layer(val_ptr->trace_image_id, l_trc_layer_id, 0);
+ gimp_image_insert_layer(val_ptr->trace_image_id, l_trc_layer_id, 0, 0);
/* merge the newly added l_trc_layer_id down to one tracelayer again */
val_ptr->trace_layer_id = gap_image_merge_visible_layers(val_ptr->trace_image_id, l_mergemode);
diff --git a/gap/gap_onion_base.c b/gap/gap_onion_base.c
index c710b56..680e93b 100644
--- a/gap/gap_onion_base.c
+++ b/gap/gap_onion_base.c
@@ -551,7 +551,7 @@ gap_onion_base_onionskin_apply(gpointer gpp
/* add the layer to current frame at desired stackposition */
- gimp_image_add_layer (image_id, l_new_layer_id, l_layerstack);
+ gimp_image_insert_layer (image_id, l_new_layer_id, 0, l_layerstack);
gimp_layer_set_offsets(l_new_layer_id, l_src_offset_x, l_src_offset_y);
/* set layername */
diff --git a/gap/gap_player_dialog.c b/gap/gap_player_dialog.c
index 319d3d9..4b0f5a6 100644
--- a/gap/gap_player_dialog.c
+++ b/gap/gap_player_dialog.c
@@ -1357,8 +1357,9 @@ p_mtrace_image( GapPlayerMainGlobalParams *gpp
,&l_src_offset_x
,&l_src_offset_y);
- gimp_image_add_layer(gpp->mtrace_image_id
+ gimp_image_insert_layer(gpp->mtrace_image_id
, dst_layer_id
+ , 0
, 0 /* top of layerstack */
);
if((width != mtrace_width)
@@ -1422,8 +1423,9 @@ p_mtrace_tmpbuf( GapPlayerMainGlobalParams *gpp
, th_bpp
, th_data
);
- gimp_image_add_layer(gpp->mtrace_image_id
+ gimp_image_insert_layer(gpp->mtrace_image_id
, dst_layer_id
+ , 0
, 0 /* top of layerstack */
);
if(th_bpp == 3)
diff --git a/gap/gap_pview_da.c b/gap/gap_pview_da.c
index e719729..4d8cdb6 100644
--- a/gap/gap_pview_da.c
+++ b/gap/gap_pview_da.c
@@ -937,7 +937,7 @@ gap_pview_render_f_from_image (GapPView *pv_ptr
, 0.0 /* Opacity full transparent */
, 0 /* NORMAL */
);
- gimp_image_add_layer(image_id, l_layer_id, 0);
+ gimp_image_insert_layer(image_id, l_layer_id, 0, 0);
l_layer_id = gimp_layer_new(image_id, "dummy_02"
, 4, 4
@@ -945,7 +945,7 @@ gap_pview_render_f_from_image (GapPView *pv_ptr
, 0.0 /* Opacity full transparent */
, 0 /* NORMAL */
);
- gimp_image_add_layer(image_id, l_layer_id, 0);
+ gimp_image_insert_layer(image_id, l_layer_id, 0, 0);
gimp_layer_resize_to_image_size(l_layer_id);
}
diff --git a/gap/gap_range_ops.c b/gap/gap_range_ops.c
index fdded21..a46cddc 100644
--- a/gap/gap_range_ops.c
+++ b/gap/gap_range_ops.c
@@ -1106,7 +1106,7 @@ p_frames_to_multilayer(GapAnimInfo *ainfo_ptr,
&l_src_offset_y);
/* add the copied layer to current destination image */
- gimp_image_add_layer(l_new_image_id, l_cp_layer_id, 0);
+ gimp_image_insert_layer(l_new_image_id, l_cp_layer_id, 0, 0);
gimp_layer_set_offsets(l_cp_layer_id, l_src_offset_x, l_src_offset_y);
if(l_clear_selected_area)
@@ -1445,7 +1445,7 @@ p_frames_convert(GapAnimInfo *ainfo_ptr,
((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
100.0, /* Opacity full opaque */
0); /* NORMAL */
- gimp_image_add_layer(l_tmp_image_id, l_dummy_layer_id, 0);
+ gimp_image_insert_layer(l_tmp_image_id, l_dummy_layer_id, 0, 0);
gimp_layer_set_offsets(l_dummy_layer_id, -1, -1);
if(l_nlayers == 0)
@@ -1457,7 +1457,7 @@ p_frames_convert(GapAnimInfo *ainfo_ptr,
((gint)(gimp_image_base_type(l_tmp_image_id)) * 2),
100.0, /* Opacity full opaque */
0); /* NORMAL */
- gimp_image_add_layer(l_tmp_image_id, l_dummy_layer_id, 0);
+ gimp_image_insert_layer(l_tmp_image_id, l_dummy_layer_id, 0, 0);
gimp_layer_set_offsets(l_dummy_layer_id, -1, -1);
}
diff --git a/gap/gap_split.c b/gap/gap_split.c
index a32bc99..eaa5cc5 100644
--- a/gap/gap_split.c
+++ b/gap/gap_split.c
@@ -286,7 +286,7 @@ p_split_image(GapAnimInfo *ainfo_ptr, split_vals_t *valPtr)
&l_src_offset_x,
&l_src_offset_y);
/* add the copied layer to current destination image */
- gimp_image_add_layer(l_new_image_id, l_cp_layer_id, 0);
+ gimp_image_insert_layer(l_new_image_id, l_cp_layer_id, 0, 0);
gimp_layer_set_offsets(l_cp_layer_id, l_src_offset_x, l_src_offset_y);
gimp_drawable_set_visible(l_cp_layer_id, TRUE);
}
@@ -301,7 +301,7 @@ p_split_image(GapAnimInfo *ainfo_ptr, split_vals_t *valPtr)
((l_type * 2 ) + 1), /* convert from GimpImageBaseType to
GimpImageType, and add alpha */
0.0, /* Opacity full transparent */
0); /* NORMAL */
- gimp_image_add_layer(l_new_image_id, l_cp_layer_id, 0);
+ gimp_image_insert_layer(l_new_image_id, l_cp_layer_id, 0, 0);
gimp_image_flatten (l_new_image_id);
}
diff --git a/gap/gap_story_att_trans_dlg.c b/gap/gap_story_att_trans_dlg.c
index 7e8cd9c..7287e92 100644
--- a/gap/gap_story_att_trans_dlg.c
+++ b/gap/gap_story_att_trans_dlg.c
@@ -1256,7 +1256,7 @@ p_check_and_make_opre_default_layer(GapStbAttrWidget *attw, gint img_idx)
, 0 /* normal mode */
);
- gimp_image_add_layer (image_id, layer_id, LAYERSTACK_TOP);
+ gimp_image_insert_layer (image_id, layer_id, 0, LAYERSTACK_TOP);
red = 0.72;
green = 0.80;
blue = 0.25;
@@ -1297,7 +1297,7 @@ p_check_and_make_orig_default_layer(GapStbAttrWidget *attw, gint img_idx)
, 0 /* normal mode */
);
- gimp_image_add_layer (image_id, layer_id, LAYERSTACK_TOP);
+ gimp_image_insert_layer (image_id, layer_id, 0, LAYERSTACK_TOP);
red = 0.42;
green = 0.90;
blue = 0.35;
@@ -1337,7 +1337,7 @@ p_create_color_layer(GapStbAttrWidget *attw, gint32 image_id
, opacity
, 0 /* normal mode */
);
- gimp_image_add_layer (image_id, layer_id, stackposition);
+ gimp_image_insert_layer (image_id, layer_id, 0, stackposition);
gap_layer_clear_to_color(layer_id, red, green, blue, 1.0);
gimp_drawable_set_visible(layer_id, TRUE);
@@ -1629,7 +1629,7 @@ p_create_transformed_layer_movepath(gint32 image_id
/* have to add alpha channel */
gimp_layer_add_alpha(mov_obj_layer_id);
}
- gimp_image_add_layer(mov_obj_image_id, mov_obj_layer_id, 0);
+ gimp_image_insert_layer(mov_obj_image_id, mov_obj_layer_id, 0, 0);
gimp_layer_set_offsets(mov_obj_layer_id, 0, 0);
}
@@ -1787,7 +1787,7 @@ p_create_transformed_layer(gint32 image_id
}
new_layer_id = gimp_layer_copy(origsize_layer_id);
- gimp_image_add_layer (image_id, new_layer_id, stackposition);
+ gimp_image_insert_layer (image_id, new_layer_id, 0, stackposition);
gimp_drawable_set_name(new_layer_id, layername);
gimp_layer_scale(new_layer_id, calculated->width, calculated->height, 0);
@@ -2246,7 +2246,7 @@ p_orig_layer_frame_fetcher(GapStbAttrWidget *attw
,100.0 /* Opacity */
,GIMP_NORMAL_MODE
);
- gimp_image_add_layer(image_id, l_layer_id, LAYERSTACK_TOP);
+ gimp_image_insert_layer(image_id, l_layer_id, 0, LAYERSTACK_TOP);
gap_layer_clear_to_color(l_layer_id
, stb_ret->stb_elem->color_red
, stb_ret->stb_elem->color_green
@@ -2562,7 +2562,7 @@ p_fetch_video_frame_as_layer(GapStbMainGlobalParams *sgpp
gimp_layer_add_alpha(l_new_layer_id);
}
- gimp_image_add_layer (image_id,l_new_layer_id, LAYERSTACK_TOP);
+ gimp_image_insert_layer (image_id,l_new_layer_id, 0, LAYERSTACK_TOP);
}
return(l_new_layer_id);
@@ -2616,7 +2616,7 @@ p_fetch_imagefile_as_layer (const char *img_filename
&l_src_offset_y
);
- gimp_image_add_layer (image_id, l_new_layer_id, LAYERSTACK_TOP);
+ gimp_image_insert_layer (image_id, l_new_layer_id, 0, LAYERSTACK_TOP);
/* destroy the tmp image */
gimp_image_delete(l_tmp_image_id);
@@ -2705,7 +2705,7 @@ p_fetch_layer_from_animimage (const char *img_filename
&l_src_offset_y
);
- gimp_image_add_layer (image_id, l_new_layer_id, LAYERSTACK_TOP);
+ gimp_image_insert_layer (image_id, l_new_layer_id, 0, LAYERSTACK_TOP);
}
g_free (l_layers_list);
@@ -2859,7 +2859,7 @@ p_create_movepath_edit_resources(GapStbAttrWidget *attw)
, 100.0 /* opacity */
, 0 /* normal mode */
);
- gimp_image_add_layer (image_id, bg_layer_id, 0);
+ gimp_image_insert_layer (image_id, bg_layer_id, 0, 0);
gap_layer_clear_to_color(bg_layer_id, 0.0, 0.0, 0.0, 0.0);
gimp_drawable_set_visible(bg_layer_id, TRUE);
@@ -2876,7 +2876,7 @@ p_create_movepath_edit_resources(GapStbAttrWidget *attw)
);
gimp_image_undo_disable (attw->movepath_obj_image_id);
attw->movepath_obj_layer_id = gimp_layer_new_from_drawable(origsize_layer_id, attw->movepath_obj_image_id);
- gimp_image_add_layer (attw->movepath_obj_image_id, attw->movepath_obj_layer_id, 0);
+ gimp_image_insert_layer (attw->movepath_obj_image_id, attw->movepath_obj_layer_id, 0, 0);
gimp_drawable_set_visible(attw->movepath_obj_layer_id, TRUE);
diff --git a/gap/gap_story_render_processor.c b/gap/gap_story_render_processor.c
index bbf6440..1f69c47 100644
--- a/gap/gap_story_render_processor.c
+++ b/gap/gap_story_render_processor.c
@@ -5076,7 +5076,7 @@ p_transform_with_movepath_processing( gint32 comp_image_id
GIMP_RGBA_IMAGE,
100.0, /* Opacity */
GIMP_NORMAL_MODE);
- gimp_image_add_layer(l_tmp_movpath_image_id, l_empty_layer_id, 0);
+ gimp_image_insert_layer(l_tmp_movpath_image_id, l_empty_layer_id, 0, 0);
gap_layer_clear_to_color(l_empty_layer_id
, 0.0, 0.0, 0.0, 0.0 /* r,g,b,a (black full transparent) */
);
@@ -5240,7 +5240,7 @@ p_transform_with_movepath_processing( gint32 comp_image_id
/* have to add alpha channel */
gimp_layer_add_alpha(l_new_layer_id);
}
- gimp_image_add_layer(comp_image_id, l_new_layer_id, 0);
+ gimp_image_insert_layer(comp_image_id, l_new_layer_id, 0, 0);
gimp_layer_set_offsets(l_new_layer_id, 0, 0);
}
@@ -5462,7 +5462,7 @@ p_transform_and_add_layer( gint32 comp_image_id
, GIMP_RGBA_IMAGE
, 0.0 /* Opacity full transparent */
,GIMP_NORMAL_MODE);
- gimp_image_add_layer(comp_image_id, l_new_layer_id, 0);
+ gimp_image_insert_layer(comp_image_id, l_new_layer_id, 0, 0);
gap_layer_clear_to_color(l_new_layer_id, 0.0, 0.0, 0.0, 0.0);
if (TRUE == p_transform_operate_on_full_layer(calculated, comp_image_id, l_tmp_image_id, frn_elem))
@@ -5767,7 +5767,7 @@ p_create_unicolor_image(gint32 *layer_id, gint32 width , gint32 height
GIMP_RGBA_IMAGE,
100.0, /* Opacity full opaque */
GIMP_NORMAL_MODE);
- gimp_image_add_layer(l_image_id, l_empty_layer_id, 0);
+ gimp_image_insert_layer(l_image_id, l_empty_layer_id, 0, 0);
/* clear layer to unique color */
gap_layer_clear_to_color(l_empty_layer_id, r_f, g_f, b_f, a_f);
diff --git a/gap/gap_vex_exec.c b/gap/gap_vex_exec.c
index 4bf4886..e9e2980 100644
--- a/gap/gap_vex_exec.c
+++ b/gap/gap_vex_exec.c
@@ -110,7 +110,7 @@ p_frame_postprocessing(t_GVA_Handle *gvahand
|| (gpp->val.extract_with_layermask == TRUE))
{
l_bbox_layer_id = gimp_layer_copy(gvahand->layer_id);
- gimp_image_add_layer(gvahand->image_id, l_bbox_layer_id, -1);
+ gimp_image_insert_layer(gvahand->image_id, l_bbox_layer_id, 0, -1);
if(gap_debug)
{
@@ -511,7 +511,7 @@ gap_vex_exe_extract_videorange(GapVexMainGlobalParams *gpp)
GIMP_RGB_IMAGE,
100.0, /* Opacity full opaque */
GIMP_NORMAL_MODE);
- gimp_image_add_layer(l_dummy_image_id, l_empty_layer_id, 0);
+ gimp_image_insert_layer(l_dummy_image_id, l_empty_layer_id, 0, 0);
gap_layer_clear_to_color(l_empty_layer_id, 0.0, 0.0, 0.0, 1.0);
l_save_run_mode = GIMP_RUN_INTERACTIVE; /* for the 1.st call of saving a non xcf frame */
diff --git a/gap/gap_water_pattern.c b/gap/gap_water_pattern.c
index a142708..8b2a801 100644
--- a/gap/gap_water_pattern.c
+++ b/gap/gap_water_pattern.c
@@ -331,8 +331,8 @@ p_init_context_and_cloud_layers(gint32 drawable_id, waterpattern_val_t *cuvals,
, 100.0 /* full opaque */
, GIMP_DIFFERENCE_MODE /* 6 */
);
- gimp_image_add_layer(ctxt->ref_image_id, cuvals->cloudLayer1, -1);
- gimp_image_add_layer(ctxt->ref_image_id, cuvals->cloudLayer2, -1);
+ gimp_image_insert_layer(ctxt->ref_image_id, cuvals->cloudLayer1, 0, -1);
+ gimp_image_insert_layer(ctxt->ref_image_id, cuvals->cloudLayer2, 0, -1);
/* Adds the solid noise */
@@ -500,7 +500,7 @@ p_run_renderWaterPattern(gint32 drawable_id, waterpattern_val_t *cuvals, waterpa
* copy the drawable to a new layer in this new image
*/
templayer_id = gimp_layer_new_from_drawable(drawable_id, ctxt->image_id);
- gimp_image_add_layer(ctxt->image_id, templayer_id, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, templayer_id, 0, -1 /* -1 place above active layer */);
}
/* copy cloud layers from ref image to current processed image_id
@@ -510,8 +510,8 @@ p_run_renderWaterPattern(gint32 drawable_id, waterpattern_val_t *cuvals, waterpa
newlayer2_id = gimp_layer_new_from_drawable(cuvals->cloudLayer2, ctxt->image_id);
gimp_image_set_active_layer(ctxt->image_id, templayer_id);
- gimp_image_add_layer(ctxt->image_id, newlayer1_id, -1 /* -1 place above active layer */);
- gimp_image_add_layer(ctxt->image_id, newlayer2_id, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, newlayer1_id, 0, -1 /* -1 place above active layer */);
+ gimp_image_insert_layer(ctxt->image_id, newlayer2_id, 0, -1 /* -1 place above active layer */);
p_cloud_size_check(newlayer1_id, ctxt);
p_cloud_size_check(newlayer2_id, ctxt);
diff --git a/gap/sel-to-anim-img.scm b/gap/sel-to-anim-img.scm
index aa323df..5353abc 100644
--- a/gap/sel-to-anim-img.scm
+++ b/gap/sel-to-anim-img.scm
@@ -80,7 +80,7 @@
(while (< idx copies)
(set! draw-name (string-append "frame_0" (number->string idx)))
(set! brush-draw (car (gimp-layer-new brush-image selection-width selection-height draw-type
draw-name 100 NORMAL)))
- (gimp-image-add-layer brush-image brush-draw 0)
+ (gimp-image-insert-layer brush-image brush-draw 0 0)
(if (= bgfill TRUE)
(gimp-drawable-fill brush-draw BG-IMAGE-FILL)
(gimp-drawable-fill brush-draw TRANS-IMAGE-FILL)
diff --git a/libgapvidapi/gap_vid_api.c b/libgapvidapi/gap_vid_api.c
index ecd4a42..1af7dbf 100644
--- a/libgapvidapi/gap_vid_api.c
+++ b/libgapvidapi/gap_vid_api.c
@@ -1118,7 +1118,7 @@ GVA_search_fcache_and_get_frame_as_gimp_layer_or_rgb888(t_GVA_Handle *gvahand
*/
/* add new layer on top of the layerstack */
- gimp_image_add_layer (fetchResult->image_id, fetchResult->layer_id, 0);
+ gimp_image_insert_layer (fetchResult->image_id, fetchResult->layer_id, 0, 0);
gimp_drawable_set_visible(fetchResult->layer_id, TRUE);
/* clear undo stack */
@@ -1450,7 +1450,7 @@ GVA_search_fcache_and_get_frame_as_gimp_layer_or_rgb888(t_GVA_Handle *gvahand
// */
//
// /* add new layer on top of the layerstack */
-// gimp_image_add_layer (image_id, l_new_layer_id, 0);
+// gimp_image_insert_layer (image_id, l_new_layer_id, 0, 0);
// gimp_drawable_set_visible(l_new_layer_id, TRUE);
//
// /* clear undo stack */
@@ -3267,7 +3267,7 @@ GVA_frame_to_gimp_layer_2(t_GVA_Handle *gvahand
/* add new layer on top of the layerstack */
- gimp_image_add_layer (*image_id, l_new_layer_id, 0);
+ gimp_image_insert_layer (*image_id, l_new_layer_id, 0, 0);
gimp_drawable_set_visible(l_new_layer_id, TRUE);
/* clear undo stack */
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index d2d4e4c..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,221 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper gnu ai mit edu>
-#
-# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor redhat com> to use GETTEXT_PACKAGE
-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob ximian com> to install
-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey novell com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package
$(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package
$(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi;
for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-#This Gets Replace for some reason
-
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)";
fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
- $(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
- $(MSGFMT) -o $@ $<
-
-.po.gmo:
- file=`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && gencat $@ $*.msg
-
-
-all: all- USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(GENPOT)
-
-install: install-data
-install-data: install-data- USE_NLS@
-install-data-no: all
-install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(itlocaledir)
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
- for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $$dir; \
- if test -r $$lang.gmo; then \
- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $(srcdir)/$$lang.gmo as" \
- "$$dir/$(GETTEXT_PACKAGE).mo"; \
- fi; \
- if test -r $$lang.gmo.m; then \
- $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- if test -r $(srcdir)/$$lang.gmo.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
- $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $(srcdir)/$$lang.gmo.m as" \
- "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- true; \
- fi; \
- fi; \
- done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
- for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- done
-
-check: all $(GETTEXT_PACKAGE).pot
-
-mostlyclean:
- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile Makefile.in POTFILES stamp-it
- rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
- rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
- dists="$(DISTFILES)"; \
- extra_dists="$(EXTRA_DISTFILES)"; \
- for file in $$extra_dists; do \
- test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
- done; \
- for file in $$dists; do \
- test -f $$file || file="$(srcdir)/$$file"; \
- ln $$file $(distdir) 2> /dev/null \
- || cp -p $$file $(distdir); \
- done
-
-update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- tmpdir=`pwd`; \
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
- for lang in $$linguas; do \
- echo "$$lang:"; \
- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
- if $$result; then \
- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "msgmerge for $$lang.gmo failed!"; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi; \
- done
-
-Makefile POTFILES: stamp-it
- @if test ! -f $@; then \
- rm -f stamp-it; \
- $(MAKE) stamp-it; \
- fi
-
-stamp-it: Makefile.in.in ../config.status POTFILES.in
- cd .. \
- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
- $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 120000
index 0000000..e4713cf
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1 @@
+/usr/share/intltool/Makefile.in.in
\ No newline at end of file
diff --git a/po/ne.po b/po/ne.po
old mode 100755
new mode 100644
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
