Skip to content

Commit

Permalink
2006-10-25 Simon Budig <[email protected]>
Browse files Browse the repository at this point in the history
	* app/vectors/vectors-enums.h: Oops. Need to specify both
	pdb-skip and skip.

	* libgimp/gimp.def
	* libgimpconfig/gimpconfig.def
	* libgimpmath/gimpmath.def
	* libgimpthumb/gimpthumb.def
	* libgimpwidgets/gimpwidgets.def: .def-file maintenance. Hope my
	changes are correct...

	With the help from
	   nm .libs/libgimpfoo-2.0.so |\
	   sed -ne "s/.* T \([a-zA-Z0-9][a-zA-Z0-9_]*\)/\t\1/p" |\
	   (echo EXPORTS ; LC_ALL=C sort )

	* libgimpwidgets/gimppageselector.c: marked stretch_frame_image()
	as static.

	* libgimp/gimpenums.c.tail
	* libgimp/gimpenums.h
	* tools/pdbgen/enums.pl: regenerated.

	* devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml: this changed
	again. WTF?


git-svn-id: http://svn.gnome.org/svn/gimp/trunk@21169 f57ce169-c725-0410-9505-c4955b3f21d2
  • Loading branch information
simon committed Oct 25, 2006
1 parent 7cb099a commit 19bd9d3
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 110 deletions.
27 changes: 27 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
2006-10-25 Simon Budig <[email protected]>

* app/vectors/vectors-enums.h: Oops. Need to specify both
pdb-skip and skip.

* libgimp/gimp.def
* libgimpconfig/gimpconfig.def
* libgimpmath/gimpmath.def
* libgimpthumb/gimpthumb.def
* libgimpwidgets/gimpwidgets.def: .def-file maintenance. Hope my
changes are correct...

With the help from
nm .libs/libgimpfoo-2.0.so |\
sed -ne "s/.* T \([a-zA-Z0-9][a-zA-Z0-9_]*\)/\t\1/p" |\
(echo EXPORTS ; LC_ALL=C sort )

* libgimpwidgets/gimppageselector.c: marked stretch_frame_image()
as static.

* libgimp/gimpenums.c.tail
* libgimp/gimpenums.h
* tools/pdbgen/enums.pl: regenerated.

* devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml: this changed
again. WTF?

2006-10-25 Simon Budig <[email protected]>

* app/vectors/gimpvectors-import.[ch]: extended gimp_vectors_import()
Expand Down
6 changes: 3 additions & 3 deletions app/vectors/vectors-enums.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
#ifndef __VECTORS_ENUMS_H__
#define __VECTORS_ENUMS_H__

typedef enum /*< skip >*/
typedef enum /*< pdb-skip, skip >*/
{
GIMP_ANCHOR_ANCHOR,
GIMP_ANCHOR_CONTROL
} GimpAnchorType;

typedef enum /*< skip >*/
typedef enum /*< pdb-skip, skip >*/
{
GIMP_ANCHOR_FEATURE_NONE,
GIMP_ANCHOR_FEATURE_EDGE,
GIMP_ANCHOR_FEATURE_ALIGNED,
GIMP_ANCHOR_FEATURE_SYMMETRIC
} GimpAnchorFeatureType;

typedef enum /*< skip >*/
typedef enum /*< pdb-skip, skip >*/
{
EXTEND_SIMPLE,
EXTEND_EDITABLE
Expand Down
10 changes: 7 additions & 3 deletions devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ GimpFontSelectButton

</para>

@:
@:
@:

@gimpfontselectbutton: the object which received the signal.
@arg1:
@arg2:
Expand All @@ -37,9 +41,9 @@ GimpFontSelectButton

</para>

@:
@:
@:
@gimpfontselectbutton: the object which received the signal.
@arg1:
@arg2:

<!-- ##### ARG GimpFontSelectButton:font-name ##### -->
<para>
Expand Down
6 changes: 5 additions & 1 deletion libgimp/gimp.def
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ EXPORTS
gimp_gradients_sample_uniform
gimp_gradients_set_gradient
gimp_gradients_set_popup
gimp_heal
gimp_heal_default
gimp_help
gimp_histogram
gimp_histogram_channel_get_type
Expand All @@ -292,6 +294,7 @@ EXPORTS
gimp_image_convert_grayscale
gimp_image_convert_indexed
gimp_image_convert_rgb
gimp_image_convert_set_dither_matrix
gimp_image_crop
gimp_image_delete
gimp_image_delete_guide
Expand Down Expand Up @@ -621,15 +624,16 @@ EXPORTS
gimp_vectors_parasite_detach
gimp_vectors_parasite_find
gimp_vectors_parasite_list
gimp_vectors_remove_stroke
gimp_vectors_set_linked
gimp_vectors_set_name
gimp_vectors_set_tattoo
gimp_vectors_set_visible
gimp_vectors_stroke_close
gimp_vectors_stroke_get_length
gimp_vectors_stroke_get_point_at_dist
gimp_vectors_stroke_get_points
gimp_vectors_stroke_interpolate
gimp_vectors_stroke_remove
gimp_vectors_stroke_scale
gimp_vectors_stroke_translate
gimp_vectors_to_selection
Expand Down
6 changes: 0 additions & 6 deletions libgimp/gimpenums.c.tail
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ typedef GType (* GimpGetTypeFunc) (void);
static const GimpGetTypeFunc get_type_funcs[] =
{
gimp_add_mask_type_get_type,
gimp_anchor_feature_type_get_type,
gimp_anchor_type_get_type,
gimp_blend_mode_get_type,
gimp_brush_application_mode_get_type,
gimp_brush_generated_shape_get_type,
Expand Down Expand Up @@ -50,15 +48,12 @@ static const GimpGetTypeFunc get_type_funcs[] =
gimp_stack_trace_mode_get_type,
gimp_transfer_mode_get_type,
gimp_transform_direction_get_type,
gimp_vector_extend_mode_get_type,
gimp_vectors_stroke_type_get_type
};

static const gchar * const type_names[] =
{
"GimpAddMaskType",
"GimpAnchorFeatureType",
"GimpAnchorType",
"GimpBlendMode",
"GimpBrushApplicationMode",
"GimpBrushGeneratedShape",
Expand Down Expand Up @@ -103,7 +98,6 @@ static const gchar * const type_names[] =
"GimpStackTraceMode",
"GimpTransferMode",
"GimpTransformDirection",
"GimpVectorExtendMode",
"GimpVectorsStrokeType"
};

Expand Down
35 changes: 0 additions & 35 deletions libgimp/gimpenums.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,6 @@
G_BEGIN_DECLS


#define GIMP_TYPE_ANCHOR_FEATURE_TYPE (gimp_anchor_feature_type_get_type ())

GType gimp_anchor_feature_type_get_type (void) G_GNUC_CONST;

typedef enum
{
GIMP_ANCHOR_FEATURE_NONE,
GIMP_ANCHOR_FEATURE_EDGE,
GIMP_ANCHOR_FEATURE_ALIGNED,
GIMP_ANCHOR_FEATURE_SYMMETRIC
} GimpAnchorFeatureType;


#define GIMP_TYPE_ANCHOR_TYPE (gimp_anchor_type_get_type ())

GType gimp_anchor_type_get_type (void) G_GNUC_CONST;

typedef enum
{
GIMP_ANCHOR_ANCHOR,
GIMP_ANCHOR_CONTROL
} GimpAnchorType;


#define GIMP_TYPE_BRUSH_APPLICATION_MODE (gimp_brush_application_mode_get_type ())

GType gimp_brush_application_mode_get_type (void) G_GNUC_CONST;
Expand Down Expand Up @@ -299,17 +275,6 @@ typedef enum
} GimpSelectCriterion;


#define GIMP_TYPE_VECTOR_EXTEND_MODE (gimp_vector_extend_mode_get_type ())

GType gimp_vector_extend_mode_get_type (void) G_GNUC_CONST;

typedef enum
{
EXTEND_SIMPLE,
EXTEND_EDITABLE
} GimpVectorExtendMode;


void gimp_enums_init (void);

const gchar ** gimp_enums_get_type_names (gint *n_type_names);
Expand Down
1 change: 0 additions & 1 deletion libgimpconfig/gimpconfig.def
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ EXPORTS
gimp_config_interface_get_type
gimp_config_is_equal_to
gimp_config_path_expand
gimp_config_path_expand
gimp_config_path_get_type
gimp_config_reset
gimp_config_reset_properties
Expand Down
3 changes: 1 addition & 2 deletions libgimpmath/gimpmath.def
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ EXPORTS
gimp_matrix4_to_deg
gimp_md5_get_digest
gimp_param_matrix2_get_type
gimp_param_spec_matrix2
gimp_param_spec_matrix2
gimp_vector2_add
gimp_vector2_add_val
gimp_vector2_cross_product
Expand Down Expand Up @@ -64,4 +64,3 @@ EXPORTS
gimp_vector_2d_to_3d
gimp_vector_2d_to_3d_val
gimp_vector_3d_to_2d

60 changes: 30 additions & 30 deletions libgimpthumb/gimpthumb.def
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
EXPORTS
gimp_thumb_ensure_thumb_dir
gimp_thumb_ensure_thumb_dir_local
gimp_thumb_error_quark
gimp_thumb_file_test
gimp_thumb_file_type_get_type
gimp_thumb_find_thumb
gimp_thumb_get_thumb_dir
gimp_thumb_get_thumb_dir_local
gimp_thumb_init
gimp_thumb_name_from_uri
gimp_thumb_name_from_uri_local
gimp_thumb_size_get_type
gimp_thumb_state_get_type
gimp_thumbnail_check_thumb
gimp_thumbnail_delete_failure
gimp_thumbnail_delete_others
gimp_thumbnail_get_type
gimp_thumbnail_has_failed
gimp_thumbnail_load_thumb
gimp_thumbnail_new
gimp_thumbnail_peek_image
gimp_thumbnail_peek_thumb
gimp_thumbnail_save_failure
gimp_thumbnail_save_thumb
gimp_thumbnail_save_thumb_local
gimp_thumbnail_set_filename
gimp_thumbnail_set_from_thumb
gimp_thumbnail_set_uri
gimp_thumbs_delete_for_uri
gimp_thumbs_delete_for_uri_local
gimp_thumb_ensure_thumb_dir
gimp_thumb_ensure_thumb_dir_local
gimp_thumb_error_quark
gimp_thumb_file_test
gimp_thumb_file_type_get_type
gimp_thumb_find_thumb
gimp_thumb_get_thumb_dir
gimp_thumb_get_thumb_dir_local
gimp_thumb_init
gimp_thumb_name_from_uri
gimp_thumb_name_from_uri_local
gimp_thumb_size_get_type
gimp_thumb_state_get_type
gimp_thumbnail_check_thumb
gimp_thumbnail_delete_failure
gimp_thumbnail_delete_others
gimp_thumbnail_get_type
gimp_thumbnail_has_failed
gimp_thumbnail_load_thumb
gimp_thumbnail_new
gimp_thumbnail_peek_image
gimp_thumbnail_peek_thumb
gimp_thumbnail_save_failure
gimp_thumbnail_save_thumb
gimp_thumbnail_save_thumb_local
gimp_thumbnail_set_filename
gimp_thumbnail_set_from_thumb
gimp_thumbnail_set_uri
gimp_thumbs_delete_for_uri
gimp_thumbs_delete_for_uri_local
2 changes: 1 addition & 1 deletion libgimpwidgets/gimppageselector.c
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ draw_frame_column (GdkPixbuf *frame_image,
}
}

GdkPixbuf *
static GdkPixbuf *
stretch_frame_image (GdkPixbuf *frame_image,
gint left_offset,
gint top_offset,
Expand Down
7 changes: 4 additions & 3 deletions libgimpwidgets/gimpwidgets.def
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ EXPORTS
gimp_color_select_get_type
gimp_color_selection_color_changed
gimp_color_selection_get_color
gimp_color_selection_set_config
gimp_color_selection_get_old_color
gimp_color_selection_get_show_alpha
gimp_color_selection_get_type
gimp_color_selection_new
gimp_color_selection_reset
gimp_color_selection_set_color
gimp_color_selection_set_config
gimp_color_selection_set_old_color
gimp_color_selection_set_show_alpha
gimp_color_selector_channel_changed
Expand All @@ -98,6 +98,7 @@ EXPORTS
gimp_controller_new
gimp_coordinates_new
gimp_dialog_add_button
gimp_dialog_add_buttons
gimp_dialog_add_buttons_valist
gimp_dialog_get_type
gimp_dialog_new
Expand Down Expand Up @@ -266,6 +267,7 @@ EXPORTS
gimp_radio_group_set_active
gimp_random_seed_new
gimp_resolution_entry_attach_label
gimp_resolution_entry_get_height
gimp_resolution_entry_get_height_help_widget
gimp_resolution_entry_get_type
gimp_resolution_entry_get_unit
Expand Down Expand Up @@ -303,8 +305,8 @@ EXPORTS
gimp_scale_entry_set_sensitive
gimp_scrolled_preview_freeze
gimp_scrolled_preview_get_type
gimp_scrolled_preview_set_position
gimp_scrolled_preview_set_policy
gimp_scrolled_preview_set_position
gimp_scrolled_preview_thaw
gimp_size_entry_add_field
gimp_size_entry_attach_label
Expand Down Expand Up @@ -351,4 +353,3 @@ EXPORTS
gimp_zoom_model_zoom
gimp_zoom_model_zoom_step
gimp_zoom_type_get_type

25 changes: 0 additions & 25 deletions tools/pdbgen/enums.pl
Original file line number Diff line number Diff line change
Expand Up @@ -552,31 +552,6 @@ package Gimp::CodeGen::enums;
symbols => [ qw(GIMP_BLUR_CONVOLVE GIMP_SHARPEN_CONVOLVE) ],
mapping => { GIMP_BLUR_CONVOLVE => '0',
GIMP_SHARPEN_CONVOLVE => '1' }
},
GimpAnchorType =>
{ contig => 1,
header => 'vectors/vectors-enums.h',
symbols => [ qw(GIMP_ANCHOR_ANCHOR GIMP_ANCHOR_CONTROL) ],
mapping => { GIMP_ANCHOR_ANCHOR => '0',
GIMP_ANCHOR_CONTROL => '1' }
},
GimpAnchorFeatureType =>
{ contig => 1,
header => 'vectors/vectors-enums.h',
symbols => [ qw(GIMP_ANCHOR_FEATURE_NONE GIMP_ANCHOR_FEATURE_EDGE
GIMP_ANCHOR_FEATURE_ALIGNED
GIMP_ANCHOR_FEATURE_SYMMETRIC) ],
mapping => { GIMP_ANCHOR_FEATURE_NONE => '0',
GIMP_ANCHOR_FEATURE_EDGE => '1',
GIMP_ANCHOR_FEATURE_ALIGNED => '2',
GIMP_ANCHOR_FEATURE_SYMMETRIC => '3' }
},
GimpVectorExtendMode =>
{ contig => 1,
header => 'vectors/vectors-enums.h',
symbols => [ qw(EXTEND_SIMPLE EXTEND_EDITABLE) ],
mapping => { EXTEND_SIMPLE => '0',
EXTEND_EDITABLE => '1' }
}
);

Expand Down

0 comments on commit 19bd9d3

Please sign in to comment.