From a8593d81414f33f6723cd2f9511b7af823935a95 Mon Sep 17 00:00:00 2001 From: Simon Budig Date: Wed, 25 Oct 2006 16:55:20 +0000 Subject: [PATCH] Oops. Need to specify both pdb-skip and skip. 2006-10-25 Simon Budig * 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? --- ChangeLog | 27 +++++++++ app/vectors/vectors-enums.h | 6 +- .../libgimp/tmpl/gimpfontselectbutton.sgml | 10 +++- libgimp/gimp.def | 6 +- libgimp/gimpenums.c.tail | 6 -- libgimp/gimpenums.h | 35 ----------- libgimpconfig/gimpconfig.def | 1 - libgimpmath/gimpmath.def | 3 +- libgimpthumb/gimpthumb.def | 60 +++++++++---------- libgimpwidgets/gimppageselector.c | 2 +- libgimpwidgets/gimpwidgets.def | 7 ++- tools/pdbgen/enums.pl | 25 -------- 12 files changed, 78 insertions(+), 110 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34b81ab364..9e2ff2a3be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2006-10-25 Simon Budig + + * 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 * app/vectors/gimpvectors-import.[ch]: extended gimp_vectors_import() diff --git a/app/vectors/vectors-enums.h b/app/vectors/vectors-enums.h index d6c52d66cf..95a39dfe93 100644 --- a/app/vectors/vectors-enums.h +++ b/app/vectors/vectors-enums.h @@ -22,13 +22,13 @@ #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, @@ -36,7 +36,7 @@ typedef enum /*< skip >*/ GIMP_ANCHOR_FEATURE_SYMMETRIC } GimpAnchorFeatureType; -typedef enum /*< skip >*/ +typedef enum /*< pdb-skip, skip >*/ { EXTEND_SIMPLE, EXTEND_EDITABLE diff --git a/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml b/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml index d7d2c2c7c8..d59d99c8b1 100644 --- a/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml +++ b/devel-docs/libgimp/tmpl/gimpfontselectbutton.sgml @@ -28,6 +28,10 @@ GimpFontSelectButton +@: +@: +@: + @gimpfontselectbutton: the object which received the signal. @arg1: @arg2: @@ -37,9 +41,9 @@ GimpFontSelectButton -@: -@: -@: +@gimpfontselectbutton: the object which received the signal. +@arg1: +@arg2: diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 9570ff51b9..5daa13a1c4 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -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 @@ -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 @@ -621,6 +624,7 @@ 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 @@ -628,8 +632,8 @@ EXPORTS 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 diff --git a/libgimp/gimpenums.c.tail b/libgimp/gimpenums.c.tail index 6b528e2eed..68c03b6587 100644 --- a/libgimp/gimpenums.c.tail +++ b/libgimp/gimpenums.c.tail @@ -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, @@ -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", @@ -103,7 +98,6 @@ static const gchar * const type_names[] = "GimpStackTraceMode", "GimpTransferMode", "GimpTransformDirection", - "GimpVectorExtendMode", "GimpVectorsStrokeType" }; diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index f1c9f92152..66a8e9c388 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -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; @@ -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); diff --git a/libgimpconfig/gimpconfig.def b/libgimpconfig/gimpconfig.def index 84c1be253d..1e763ffb72 100644 --- a/libgimpconfig/gimpconfig.def +++ b/libgimpconfig/gimpconfig.def @@ -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 diff --git a/libgimpmath/gimpmath.def b/libgimpmath/gimpmath.def index 1060865895..a5540ca30c 100644 --- a/libgimpmath/gimpmath.def +++ b/libgimpmath/gimpmath.def @@ -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 @@ -64,4 +64,3 @@ EXPORTS gimp_vector_2d_to_3d gimp_vector_2d_to_3d_val gimp_vector_3d_to_2d - diff --git a/libgimpthumb/gimpthumb.def b/libgimpthumb/gimpthumb.def index 2b04daf106..4ac56bfb8b 100644 --- a/libgimpthumb/gimpthumb.def +++ b/libgimpthumb/gimpthumb.def @@ -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 diff --git a/libgimpwidgets/gimppageselector.c b/libgimpwidgets/gimppageselector.c index 9806b8ca9c..d095d99e63 100644 --- a/libgimpwidgets/gimppageselector.c +++ b/libgimpwidgets/gimppageselector.c @@ -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, diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def index 2192125884..3aa354e7f4 100644 --- a/libgimpwidgets/gimpwidgets.def +++ b/libgimpwidgets/gimpwidgets.def @@ -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 @@ -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 @@ -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 @@ -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 @@ -351,4 +353,3 @@ EXPORTS gimp_zoom_model_zoom gimp_zoom_model_zoom_step gimp_zoom_type_get_type - diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 03e748cc44..685b719e52 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -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' } } );