7 files changed, 2793 insertions, 10 deletions

diff --git a/win32/libemiscwidgets.def b/win32/libemiscwidgets.def
index c91c7b81fc..2681060858 100644
--- a/win32/libemiscwidgets.def
+++ b/win32/libemiscwidgets.def
@@ -1,20 +1,98 @@
 EXPORTS
+	e_account_combo_box_get_account_list
+	e_account_combo_box_get_active
+	e_account_combo_box_get_active_name
+	e_account_combo_box_get_type
+	e_account_combo_box_new
+	e_account_combo_box_set_account_list
+	e_account_combo_box_set_active
+	e_account_combo_box_set_active_name
+	e_account_combo_box_set_session
+	e_activity_handler_attach_task_bar
+	e_activity_handler_cancelable_operation_started
+	e_activity_handler_get_type
+	e_activity_handler_make_error
+	e_activity_handler_new
+	e_activity_handler_operation_finished
+	e_activity_handler_operation_progressing
+	e_activity_handler_operation_set_error
+	e_activity_handler_operation_started
+	e_activity_handler_set_error_flush_time
+	e_activity_handler_set_logger
+	e_activity_handler_set_message
+	e_activity_handler_unset_message
+	e_attachment_bar_add_attachment
+	e_attachment_bar_add_attachment_silent
+	e_attachment_bar_attach
+	e_attachment_bar_attach_mime_part
+	e_attachment_bar_attach_remote_file
+	e_attachment_bar_bonobo_ui_populate_with_recent
+	e_attachment_bar_create_attachment_cache
+	e_attachment_bar_edit_selected
+	e_attachment_bar_get_all_attachments
+	e_attachment_bar_get_attachment
+	e_attachment_bar_get_download_count
+	e_attachment_bar_get_num_attachments
+	e_attachment_bar_get_parts
+	e_attachment_bar_get_selected
+	e_attachment_bar_get_selector
+	e_attachment_bar_get_type
+	e_attachment_bar_new
+	e_attachment_bar_recent_action_new
+	e_attachment_bar_refresh
+	e_attachment_bar_remove_selected
+	e_attachment_bar_set_width
+	e_attachment_bar_to_multipart
+	e_attachment_build_remote_file
+	e_attachment_edit
+	e_attachment_get_type
+	e_attachment_new
+	e_attachment_new_from_mime_part
+	e_attachment_new_remote_file
+	e_auto_kill_popup_menu_on_selection_done
+	e_black DATA
+	e_calendar_get_border_size
+	e_calendar_get_type
+	e_calendar_item_clear_marks
 	e_calendar_item_get_date_range
+	e_calendar_item_get_days_start_week_sel
+	e_calendar_item_get_display_popup
+	e_calendar_item_get_first_month
+	e_calendar_item_get_max_days_sel
 	e_calendar_item_get_selection
 	e_calendar_item_get_type
 	e_calendar_item_get_week_number
+	e_calendar_item_mark_day
+	e_calendar_item_mark_days
 	e_calendar_item_normalize_date
+	e_calendar_item_set_days_start_week_sel
+	e_calendar_item_set_display_popup
+	e_calendar_item_set_first_month
+	e_calendar_item_set_get_time_callback
+	e_calendar_item_set_max_days_sel
 	e_calendar_item_set_selection
+	e_calendar_item_set_style_callback
+	e_calendar_item_style_set
+	e_calendar_new
+	e_calendar_set_focusable
+	e_calendar_set_maximum_size
+	e_calendar_set_minimum_size
 	e_canvas_background_get_type
 	e_canvas_get_type
 	e_canvas_hide_tooltip
+	e_canvas_item_add_selection
 	e_canvas_item_area_shown
 	e_canvas_item_grab
 	e_canvas_item_grab_focus
 	e_canvas_item_move_absolute
+	e_canvas_item_remove_selection
 	e_canvas_item_request_parent_reflow
 	e_canvas_item_request_reflow
+	e_canvas_item_set_cursor
+	e_canvas_item_set_cursor_end
 	e_canvas_item_set_reflow_callback
+	e_canvas_item_set_selection_callback
+	e_canvas_item_set_selection_compare_callback
 	e_canvas_item_show_area
 	e_canvas_item_show_area_delayed
 	e_canvas_item_ungrab
@@ -23,42 +101,212 @@ EXPORTS
 	e_canvas_vbox_add_item
 	e_canvas_vbox_add_item_start
 	e_canvas_vbox_get_type
+	e_cell_date_edit_freeze
+	e_cell_date_edit_get_type
+	e_cell_date_edit_new
+	e_cell_date_edit_set_get_time_callback
+	e_cell_date_edit_thaw
+	e_cell_percent_get_type
+	e_cell_percent_new
+	e_cell_renderer_combo_get_type
+	e_cell_renderer_combo_new
+	e_charset_add_radio_actions
+	e_charset_picker_bonobo_ui_populate
+	e_charset_picker_dialog
+	e_charset_picker_get_charset
+	e_charset_picker_new
+	e_color_alloc_gdk
+	e_color_alloc_name
+	e_color_init
+	e_combo_button_construct
 	e_combo_button_get_label
 	e_combo_button_get_type
+	e_combo_button_new
+	e_combo_button_pack_hbox
+	e_combo_button_pack_vbox
 	e_combo_button_popup_menu
+	e_combo_button_set_icon
+	e_combo_button_set_label
+	e_combo_button_set_menu
+	e_combo_cell_editable_cancelled
+	e_combo_cell_editable_get_list
+	e_combo_cell_editable_get_text
+	e_combo_cell_editable_get_type
+	e_combo_cell_editable_new
+	e_combo_cell_editable_set_list
+	e_combo_cell_editable_set_text
+	e_config_page_get_type
+	e_config_page_new
+	e_container_change_tab_order
+	e_container_focus_nth_entry
+	e_container_foreach_leaf
 	e_cursor_get
+	e_cursors_init
+	e_cursors_shutdown
+	e_dark_gray DATA
+	e_date_edit_date_is_valid
+	e_date_edit_get_allow_no_date_set
+	e_date_edit_get_date
+	e_date_edit_get_entry
+	e_date_edit_get_make_time_insensitive
+	e_date_edit_get_show_date
+	e_date_edit_get_show_time
+	e_date_edit_get_show_week_numbers
+	e_date_edit_get_time
+	e_date_edit_get_time_of_day
+	e_date_edit_get_time_popup_range
+	e_date_edit_get_twodigit_year_can_future
+	e_date_edit_get_type
+	e_date_edit_get_use_24_hour_format
+	e_date_edit_get_week_start_day
+	e_date_edit_have_time
+	e_date_edit_new
+	e_date_edit_set_allow_no_date_set
+	e_date_edit_set_date
+	e_date_edit_set_date_and_time_of_day
+	e_date_edit_set_editable
+	e_date_edit_set_get_time_callback
+	e_date_edit_set_make_time_insensitive
+	e_date_edit_set_show_date
+	e_date_edit_set_show_time
+	e_date_edit_set_show_week_numbers
+	e_date_edit_set_time
+	e_date_edit_set_time_of_day
+	e_date_edit_set_time_popup_range
+	e_date_edit_set_twodigit_year_can_future
+	e_date_edit_set_use_24_hour_format
+	e_date_edit_set_week_start_day
+	e_date_edit_time_is_valid
+	e_dropdown_button_construct
+	e_dropdown_button_get_type
+	e_dropdown_button_new
+	e_expander_get_expanded
+	e_expander_get_label
+	e_expander_get_label_widget
+	e_expander_get_spacing
 	e_expander_get_type
+	e_expander_get_use_underline
+	e_expander_new
+	e_expander_new_with_mnemonic
+	e_expander_set_expanded
+	e_expander_set_label
+	e_expander_set_label_widget
+	e_expander_set_spacing
+	e_expander_set_use_underline
+	e_glade_xml_connect_widget
+	e_glade_xml_set_sensitive
+	e_hsv_to_rgb
 	e_hsv_tweak
+	e_icon_entry_create_button
+	e_icon_entry_get_entry
+	e_icon_entry_get_type
+	e_icon_entry_new
+	e_icon_entry_pack_widget
+	e_image_chooser_get_image_data
+	e_image_chooser_get_type
+	e_image_chooser_new
+	e_image_chooser_set_editable
+	e_image_chooser_set_from_file
+	e_image_chooser_set_image_data
+	e_info_label_get_type
+	e_info_label_new
+	e_info_label_set_info
 	e_map_add_point
+	e_map_freeze
 	e_map_get_closest_point
 	e_map_get_magnification
+	e_map_get_smooth_zoom
+	e_map_get_type
 	e_map_new
 	e_map_point_get_color_rgba
+	e_map_point_get_data
 	e_map_point_get_location
+	e_map_point_get_name
+	e_map_point_is_in_view
 	e_map_point_set_color_rgba
+	e_map_point_set_data
+	e_map_remove_point
+	e_map_set_smooth_zoom
+	e_map_thaw
 	e_map_window_to_world
+	e_map_world_to_window
 	e_map_zoom_out
 	e_map_zoom_to_location
+	e_multi_config_dialog_add_page
+	e_multi_config_dialog_get_type
+	e_multi_config_dialog_new
+	e_multi_config_dialog_show_page
+	e_online_button_get_online
+	e_online_button_get_type
+	e_online_button_new
+	e_online_button_set_online
 	e_popup_menu
+	e_popup_menu_copy
+	e_popup_menu_copy_1
+	e_popup_menu_create
 	e_popup_menu_create_with_domain
+	e_popup_menu_free
+	e_popup_menu_free_1
+	e_popup_menu_run
 	e_printable_data_left
+	e_printable_get_type
 	e_printable_height
 	e_printable_new
 	e_printable_print_page
 	e_printable_reset
 	e_printable_will_fit
 	e_reflow_get_type
+	e_reflow_model_changed
+	e_reflow_model_compare
+	e_reflow_model_comparison_changed
+	e_reflow_model_count
+	e_reflow_model_get_type
+	e_reflow_model_height
+	e_reflow_model_incarnate
+	e_reflow_model_item_changed
+	e_reflow_model_item_removed
+	e_reflow_model_items_inserted
+	e_reflow_model_reincarnate
+	e_reflow_model_set_width
+	e_rgb_to_hsv
+	e_search_bar_add_menu
+	e_search_bar_construct
+	e_search_bar_get_item_id
+	e_search_bar_get_search_scope
+	e_search_bar_get_selected_viewitem
+	e_search_bar_get_text
+	e_search_bar_get_type
+	e_search_bar_get_viewitem_id
+	e_search_bar_new
+	e_search_bar_paint
+	e_search_bar_scope_enable
+	e_search_bar_set_ids
+	e_search_bar_set_item_id
+	e_search_bar_set_item_menu
+	e_search_bar_set_menu
+	e_search_bar_set_menu_sensitive
+	e_search_bar_set_option
+	e_search_bar_set_scopeoption
+	e_search_bar_set_scopeoption_menu
+	e_search_bar_set_search_scope
+	e_search_bar_set_text
+	e_search_bar_set_ui_component
+	e_search_bar_set_viewitem_id
+	e_search_bar_set_viewoption
+	e_search_bar_set_viewoption_menu
+	e_search_bar_set_viewoption_menufunc
 	e_selection_model_array_confirm_row_count
 	e_selection_model_array_delete_rows
+	e_selection_model_array_get_row_count
 	e_selection_model_array_get_type
 	e_selection_model_array_insert_rows
+	e_selection_model_array_move_row
 	e_selection_model_change_cursor
 	e_selection_model_change_one_row
 	e_selection_model_clear
 	e_selection_model_cursor_activated
 	e_selection_model_cursor_changed
 	e_selection_model_cursor_col
-	e_selection_model_cursor_col
 	e_selection_model_cursor_row
 	e_selection_model_do_something
 	e_selection_model_foreach
@@ -67,19 +315,86 @@ EXPORTS
 	e_selection_model_is_row_selected
 	e_selection_model_key_press
 	e_selection_model_maybe_do_something
+	e_selection_model_move_selection_end
 	e_selection_model_right_click_down
 	e_selection_model_right_click_up
-	e_selection_model_right_key_press
+	e_selection_model_row_count
 	e_selection_model_select_all
 	e_selection_model_select_as_key_press
 	e_selection_model_select_single_row
 	e_selection_model_selected_count
 	e_selection_model_selection_changed
 	e_selection_model_selection_row_changed
+	e_selection_model_set_selection_end
+	e_selection_model_simple_delete_rows
+	e_selection_model_simple_get_type
+	e_selection_model_simple_insert_rows
+	e_selection_model_simple_move_row
+	e_selection_model_simple_new
+	e_selection_model_simple_set_row_count
 	e_selection_model_toggle_single_row
+	e_sendoptions_dialog_get_type
+	e_sendoptions_dialog_new
+	e_sendoptions_dialog_run
+	e_sendoptions_get_need_general_options
+	e_sendoptions_set_global
+	e_sendoptions_set_need_general_options
+	e_signature_combo_box_get_active
+	e_signature_combo_box_get_signature_list
+	e_signature_combo_box_get_type
+	e_signature_combo_box_new
+	e_signature_combo_box_set_active
+	e_signature_combo_box_set_signature_list
+	e_spinner_new_spinning_small_shown
+	e_task_bar_construct
+	e_task_bar_get_task_widget
+	e_task_bar_get_task_widget_from_id
+	e_task_bar_get_type
+	e_task_bar_new
+	e_task_bar_prepend_task
+	e_task_bar_remove_task
+	e_task_bar_remove_task_from_id
+	e_task_bar_set_message
+	e_task_bar_unset_message
+	e_task_widget_construct
+	e_task_widget_get_component_id
+	e_task_widget_get_type
+	e_task_widget_new
+	e_task_widget_new_with_cancel
+	e_task_widget_update
+	e_task_widget_update_image
+	e_task_wiget_alert
+	e_task_wiget_unalert
+	e_unichar_to_utf8
+	e_unicode_get_utf8
+	e_url_entry_get_entry
+	e_url_entry_get_type
+	e_url_entry_new
+	e_utf8_from_charset_string
+	e_utf8_from_charset_string_sized
 	e_utf8_from_gtk_event_key
+	e_utf8_from_iconv_string
+	e_utf8_from_iconv_string_sized
+	e_utf8_from_locale_string
+	e_utf8_from_locale_string_sized
+	e_utf8_gtk_editable_get_chars
+	e_utf8_gtk_editable_get_text
+	e_utf8_gtk_editable_insert_text
+	e_utf8_gtk_editable_set_text
+	e_utf8_gtk_entry_get_text
+	e_utf8_gtk_entry_set_text
+	e_utf8_is_ascii
+	e_utf8_strstrcase
+	e_utf8_strstrcasedecomp
+	e_utf8_to_charset_string
+	e_utf8_to_charset_string_sized
+	e_utf8_to_iconv_string
+	e_utf8_to_iconv_string_sized
 	e_utf8_to_locale_string
-	gal_combo_text_add_item
-	gal_combo_text_get_type
-	gal_combo_text_new
-	gal_combo_text_set_text
+	e_utf8_to_locale_string_sized
+	e_utf8_xml1_decode
+	e_utf8_xml1_encode
+	e_white DATA
+	e_xml_get_translated_utf8_string_prop_by_name
+	icon_data DATA
+	send_options_make_dateedit
diff --git a/win32/libetable.def b/win32/libetable.def
index ce00472e0e..f735270ee0 100644
--- a/win32/libetable.def
+++ b/win32/libetable.def
@@ -1,40 +1,508 @@
 EXPORTS
+	e_cell_checkbox_get_type
+	e_cell_checkbox_new
+	e_cell_combo_get_type
+	e_cell_combo_new
+	e_cell_combo_set_popdown_strings
+	e_cell_date_get_type
+	e_cell_date_new
+	e_cell_draw
+	e_cell_enter_edit
+	e_cell_event
+	e_cell_free_state
+	e_cell_get_bg_color
+	e_cell_get_type
+	e_cell_hbox_append
+	e_cell_hbox_get_type
+	e_cell_hbox_new
 	e_cell_height
+	e_cell_kill_view
+	e_cell_leave_edit
+	e_cell_load_state
+	e_cell_max_width
+	e_cell_max_width_by_row
+	e_cell_max_width_by_row_implemented
+	e_cell_new_view
+	e_cell_number_get_type
+	e_cell_number_new
+	e_cell_pixbuf_construct
+	e_cell_pixbuf_get_type
+	e_cell_pixbuf_new
+	e_cell_popup_get_child
 	e_cell_popup_get_type
+	e_cell_popup_new
+	e_cell_popup_queue_cell_redraw
+	e_cell_popup_set_child
+	e_cell_popup_set_shown
+	e_cell_print
+	e_cell_print_height
+	e_cell_realize
+	e_cell_save_state
+	e_cell_show_tooltip
+	e_cell_size_get_type
+	e_cell_size_new
+	e_cell_style_set
+	e_cell_text_construct
 	e_cell_text_copy_clipboard
 	e_cell_text_delete_selection
+	e_cell_text_free_text
 	e_cell_text_get_selection
+	e_cell_text_get_text
 	e_cell_text_get_text_by_view
 	e_cell_text_get_type
+	e_cell_text_new
 	e_cell_text_paste_clipboard
 	e_cell_text_set_selection
 	e_cell_text_set_value
+	e_cell_toggle_construct
+	e_cell_toggle_get_type
+	e_cell_toggle_new
+	e_cell_tree_construct
+	e_cell_tree_get_type
+	e_cell_tree_new
 	e_cell_tree_view_get_subcell_view
+	e_cell_unrealize
+	e_cell_vbox_append
+	e_cell_vbox_get_type
+	e_cell_vbox_new
+	e_table_click_to_add_commit
 	e_table_click_to_add_get_type
 	e_table_col_get_type
+	e_table_col_new
+	e_table_col_new_with_pixbuf
+	e_table_column_specification_get_type
+	e_table_column_specification_load_from_node
+	e_table_column_specification_new
+	e_table_column_specification_save_to_node
+	e_table_commit_click_to_add
+	e_table_config_construct
+	e_table_config_get_type
+	e_table_config_new
+	e_table_config_raise
+	e_table_construct
+	e_table_construct_from_spec_file
+	e_table_drag_begin
+	e_table_drag_dest_set
+	e_table_drag_dest_set_proxy
+	e_table_drag_dest_unset
+	e_table_drag_get_data
+	e_table_drag_highlight
+	e_table_drag_source_set
+	e_table_drag_source_unset
+	e_table_drag_unhighlight
+	e_table_extras_add_cell
+	e_table_extras_add_compare
+	e_table_extras_add_pixbuf
+	e_table_extras_add_search
+	e_table_extras_get_cell
+	e_table_extras_get_compare
+	e_table_extras_get_pixbuf
+	e_table_extras_get_search
+	e_table_extras_get_type
+	e_table_extras_new
+	e_table_field_chooser_dialog_get_type
+	e_table_field_chooser_dialog_new
+	e_table_field_chooser_get_type
+	e_table_field_chooser_item_get_type
+	e_table_field_chooser_new
 	e_table_get_cell_at
 	e_table_get_cell_geometry
+	e_table_get_cursor_row
+	e_table_get_mouse_over_cell
+	e_table_get_next_row
+	e_table_get_prev_row
+	e_table_get_printable
+	e_table_get_selection_model
+	e_table_get_state
+	e_table_get_state_object
 	e_table_get_type
+	e_table_group_add
+	e_table_group_add_all
+	e_table_group_add_array
+	e_table_group_apply_to_leafs
+	e_table_group_click
+	e_table_group_compute_location
+	e_table_group_construct
+	e_table_group_container_construct
 	e_table_group_container_get_type
+	e_table_group_container_new
+	e_table_group_cursor_activated
+	e_table_group_cursor_change
+	e_table_group_decrement
+	e_table_group_double_click
+	e_table_group_get_cell_geometry
+	e_table_group_get_focus
+	e_table_group_get_focus_column
+	e_table_group_get_header
+	e_table_group_get_mouse_over
+	e_table_group_get_printable
 	e_table_group_get_type
+	e_table_group_increment
+	e_table_group_key_press
 	e_table_group_leaf_get_type
+	e_table_group_leaf_new
+	e_table_group_new
+	e_table_group_remove
+	e_table_group_right_click
+	e_table_group_row_count
+	e_table_group_set_focus
+	e_table_group_start_drag
+	e_table_header_add_column
+	e_table_header_col_diff
+	e_table_header_compute_height
+	e_table_header_count
+	e_table_header_draw_button
 	e_table_header_get_column
+	e_table_header_get_column_by_col_idx
 	e_table_header_get_columns
+	e_table_header_get_index_at
+	e_table_header_get_selected
+	e_table_header_get_type
+	e_table_header_index
 	e_table_header_item_get_type
+	e_table_header_min_width
+	e_table_header_move
+	e_table_header_new
+	e_table_header_prioritized_column
+	e_table_header_prioritized_column_selected
+	e_table_header_remove
+	e_table_header_set_selection
+	e_table_header_set_size
+	e_table_header_total_width
+	e_table_header_update_horizontal
+	e_table_header_width_extras
+	e_table_invert_selection
+	e_table_item_compute_location
+	e_table_item_compute_mouse_over
 	e_table_item_enter_edit
 	e_table_item_get_cell_geometry
+	e_table_item_get_focused_column
+	e_table_item_get_printable
 	e_table_item_get_type
+	e_table_item_leave_edit
+	e_table_item_redraw_range
+	e_table_item_row_diff
+	e_table_item_set_cursor
+	e_table_load_state
+	e_table_memory_callbacks_get_type
+	e_table_memory_callbacks_new
+	e_table_memory_clear
+	e_table_memory_freeze
+	e_table_memory_get_data
+	e_table_memory_get_type
+	e_table_memory_insert
+	e_table_memory_new
+	e_table_memory_remove
+	e_table_memory_set_data
+	e_table_memory_store_adopt_value_at
+	e_table_memory_store_change
+	e_table_memory_store_change_adopt
+	e_table_memory_store_change_adopt_array
+	e_table_memory_store_change_array
+	e_table_memory_store_clear
+	e_table_memory_store_construct
+	e_table_memory_store_get_type
+	e_table_memory_store_insert
+	e_table_memory_store_insert_adopt
+	e_table_memory_store_insert_adopt_array
+	e_table_memory_store_insert_array
+	e_table_memory_store_new
+	e_table_memory_store_remove
+	e_table_memory_thaw
+	e_table_model_append_row
+	e_table_model_cell_changed
+	e_table_model_changed
 	e_table_model_column_count
+	e_table_model_duplicate_value
+	e_table_model_free_value
+	e_table_model_freeze
+	e_table_model_get_save_id
+	e_table_model_get_type
+	e_table_model_has_change_pending
+	e_table_model_has_save_id
+	e_table_model_initialize_value
 	e_table_model_is_cell_editable
+	e_table_model_no_change
+	e_table_model_pre_change
+	e_table_model_row_changed
+	e_table_model_row_count
+	e_table_model_row_deleted
+	e_table_model_row_inserted
+	e_table_model_rows_deleted
+	e_table_model_rows_inserted
+	e_table_model_set_value_at
+	e_table_model_thaw
+	e_table_model_to_view_row
 	e_table_model_value_at
+	e_table_model_value_is_empty
+	e_table_model_value_to_string
+	e_table_new
+	e_table_new_from_spec_file
+	e_table_one_commit
+	e_table_one_get_type
+	e_table_one_new
+	e_table_proxy_etable_available_new
+	e_table_proxy_etable_shown_new
+	e_table_proxy_gtk_combo_text_new
+	e_table_right_click_up
+	e_table_save_state
+	e_table_scrolled_construct
+	e_table_scrolled_construct_from_spec_file
+	e_table_scrolled_get_table
+	e_table_scrolled_get_type
+	e_table_scrolled_new
+	e_table_scrolled_new_from_spec_file
+	e_table_search_backspace
+	e_table_search_get_type
+	e_table_search_input_character
+	e_table_search_new
+	e_table_select_all
+	e_table_selected_count
+	e_table_selected_row_foreach
+	e_table_selection_model_get_type
+	e_table_selection_model_new
+	e_table_set_cursor_row
+	e_table_set_state
+	e_table_set_state_object
+	e_table_simple_get_type
+	e_table_simple_new
+	e_table_simple_string_duplicate_value
+	e_table_simple_string_free_value
+	e_table_simple_string_initialize_value
+	e_table_simple_string_value_is_empty
+	e_table_simple_string_value_to_string
+	e_table_sort_info_duplicate
+	e_table_sort_info_freeze
+	e_table_sort_info_get_can_group
+	e_table_sort_info_get_type
+	e_table_sort_info_grouping_get_count
+	e_table_sort_info_grouping_get_nth
+	e_table_sort_info_grouping_set_nth
+	e_table_sort_info_grouping_truncate
+	e_table_sort_info_load_from_node
+	e_table_sort_info_new
+	e_table_sort_info_save_to_node
+	e_table_sort_info_set_can_group
+	e_table_sort_info_sorting_get_count
+	e_table_sort_info_sorting_get_nth
+	e_table_sort_info_sorting_set_nth
+	e_table_sort_info_sorting_truncate
+	e_table_sort_info_thaw
+	e_table_sorted_get_type
+	e_table_sorted_new
+	e_table_sorted_variable_get_type
+	e_table_sorted_variable_new
+	e_table_sorter_get_type
+	e_table_sorter_new
+	e_table_sorting_utils_affects_sort
+	e_table_sorting_utils_check_position
+	e_table_sorting_utils_insert
+	e_table_sorting_utils_sort
+	e_table_sorting_utils_tree_check_position
+	e_table_sorting_utils_tree_insert
+	e_table_sorting_utils_tree_sort
+	e_table_spec_to_full_header
+	e_table_specification_duplicate
+	e_table_specification_get_type
+	e_table_specification_load_from_file
+	e_table_specification_load_from_node
+	e_table_specification_load_from_string
+	e_table_specification_new
+	e_table_specification_save_to_file
+	e_table_specification_save_to_node
+	e_table_specification_save_to_string
+	e_table_state_duplicate
+	e_table_state_get_type
+	e_table_state_load_from_file
+	e_table_state_load_from_node
+	e_table_state_load_from_string
+	e_table_state_new
+	e_table_state_save_to_file
+	e_table_state_save_to_node
+	e_table_state_save_to_string
+	e_table_state_to_header
+	e_table_state_vanilla
+	e_table_subset_construct
+	e_table_subset_get_toplevel
 	e_table_subset_get_type
+	e_table_subset_model_to_view_row
+	e_table_subset_new
+	e_table_subset_print_debugging
+	e_table_subset_variable_add
+	e_table_subset_variable_add_all
+	e_table_subset_variable_add_array
+	e_table_subset_variable_clear
+	e_table_subset_variable_construct
+	e_table_subset_variable_decrement
+	e_table_subset_variable_get_type
+	e_table_subset_variable_increment
+	e_table_subset_variable_new
+	e_table_subset_variable_remove
+	e_table_subset_variable_set_allocation
+	e_table_subset_view_to_model_row
+	e_table_util_calculate_current_search_col
+	e_table_view_to_model_row
+	e_table_without_construct
+	e_table_without_get_type
+	e_table_without_hide
+	e_table_without_hide_adopt
+	e_table_without_new
+	e_table_without_show
+	e_table_without_show_all
+	e_tree_construct
+	e_tree_construct_from_spec_file
+	e_tree_drag_begin
+	e_tree_drag_dest_set
+	e_tree_drag_dest_set_proxy
+	e_tree_drag_dest_unset
+	e_tree_drag_get_data
+	e_tree_drag_highlight
+	e_tree_drag_source_set
+	e_tree_drag_source_unset
+	e_tree_drag_unhighlight
+	e_tree_find_next
+	e_tree_force_expanded_state
 	e_tree_get_cell_at
 	e_tree_get_cell_geometry
+	e_tree_get_cursor
 	e_tree_get_header_item
 	e_tree_get_item
 	e_tree_get_model
+	e_tree_get_next_row
+	e_tree_get_prev_row
+	e_tree_get_printable
+	e_tree_get_selection_model
+	e_tree_get_spec
+	e_tree_get_state
+	e_tree_get_state_object
+	e_tree_get_table_adapter
+	e_tree_get_tooltip
 	e_tree_get_type
+	e_tree_load_expanded_state
+	e_tree_load_expanded_state_xml
+	e_tree_load_state
+	e_tree_memory_callbacks_get_type
+	e_tree_memory_callbacks_new
+	e_tree_memory_construct
+	e_tree_memory_freeze
+	e_tree_memory_get_type
+	e_tree_memory_new
+	e_tree_memory_node_get_data
+	e_tree_memory_node_insert
+	e_tree_memory_node_insert_before
+	e_tree_memory_node_insert_id
+	e_tree_memory_node_remove
+	e_tree_memory_node_set_data
+	e_tree_memory_set_expanded_default
+	e_tree_memory_set_node_destroy_func
+	e_tree_memory_sort_node
+	e_tree_memory_thaw
+	e_tree_model_column_count
+	e_tree_model_duplicate_value
+	e_tree_model_free_value
+	e_tree_model_get_expanded_default
+	e_tree_model_get_node_by_id
+	e_tree_model_get_root
+	e_tree_model_get_save_id
+	e_tree_model_get_type
+	e_tree_model_has_change_pending
+	e_tree_model_has_get_node_by_id
+	e_tree_model_has_save_id
+	e_tree_model_icon_at
+	e_tree_model_initialize_value
+	e_tree_model_new
+	e_tree_model_no_change
+	e_tree_model_node_changed
+	e_tree_model_node_col_changed
+	e_tree_model_node_data_changed
+	e_tree_model_node_deleted
+	e_tree_model_node_depth
+	e_tree_model_node_find
+	e_tree_model_node_get_children
+	e_tree_model_node_get_first_child
+	e_tree_model_node_get_last_child
+	e_tree_model_node_get_next
+	e_tree_model_node_get_parent
+	e_tree_model_node_get_prev
+	e_tree_model_node_inserted
+	e_tree_model_node_is_editable
 	e_tree_model_node_is_expandable
+	e_tree_model_node_is_root
+	e_tree_model_node_removed
+	e_tree_model_node_request_collapse
+	e_tree_model_node_traverse
+	e_tree_model_node_traverse_preorder
+	e_tree_model_pre_change
+	e_tree_model_set_value_at
+	e_tree_model_sort_value_at
+	e_tree_model_to_view_row
+	e_tree_model_value_at
+	e_tree_model_value_is_empty
+	e_tree_model_value_to_string
+	e_tree_new
+	e_tree_new_from_spec_file
+	e_tree_node_at_row
+	e_tree_node_is_expanded
+	e_tree_node_set_expanded
+	e_tree_node_set_expanded_recurse
+	e_tree_path_foreach
+	e_tree_right_click_up
+	e_tree_root_node_is_visible
+	e_tree_root_node_set_visible
+	e_tree_row_count
+	e_tree_row_of_node
+	e_tree_save_expanded_state
+	e_tree_save_expanded_state_xml
+	e_tree_save_state
+	e_tree_scrolled_construct
+	e_tree_scrolled_construct_from_spec_file
+	e_tree_scrolled_get_tree
+	e_tree_scrolled_get_type
+	e_tree_scrolled_new
+	e_tree_scrolled_new_from_spec_file
+	e_tree_selected_path_foreach
+	e_tree_selected_row_foreach
+	e_tree_selection_model_add_to_selection
+	e_tree_selection_model_change_cursor
+	e_tree_selection_model_foreach
+	e_tree_selection_model_get_cursor
+	e_tree_selection_model_get_type
+	e_tree_selection_model_new
+	e_tree_selection_model_select_paths
+	e_tree_selection_model_select_single_path
+	e_tree_set_cursor
+	e_tree_set_info_message
+	e_tree_set_search_column
+	e_tree_set_state
+	e_tree_set_state_object
+	e_tree_show_node
+	e_tree_sorted_construct
+	e_tree_sorted_get_sort_info
+	e_tree_sorted_get_type
+	e_tree_sorted_model_to_view_path
+	e_tree_sorted_new
+	e_tree_sorted_node_num_children
+	e_tree_sorted_node_resorted
+	e_tree_sorted_orig_position
+	e_tree_sorted_set_sort_info
+	e_tree_sorted_view_to_model_path
+	e_tree_table_adapter_construct
+	e_tree_table_adapter_force_expanded_state
+	e_tree_table_adapter_get_type
+	e_tree_table_adapter_load_expanded_state
+	e_tree_table_adapter_load_expanded_state_xml
+	e_tree_table_adapter_new
+	e_tree_table_adapter_node_at_row
+	e_tree_table_adapter_node_get_next
 	e_tree_table_adapter_node_is_expanded
 	e_tree_table_adapter_node_set_expanded
+	e_tree_table_adapter_node_set_expanded_recurse
+	e_tree_table_adapter_root_node_is_visible
+	e_tree_table_adapter_root_node_set_visible
+	e_tree_table_adapter_row_of_node
+	e_tree_table_adapter_save_expanded_state
+	e_tree_table_adapter_save_expanded_state_xml
+	e_tree_table_adapter_set_sort_info
+	e_tree_table_adapter_show_node
+	e_tree_view_to_model_row
 	ethi_change_sort_state
diff --git a/win32/libetext.def b/win32/libetext.def
index 69d1176c28..038263b1d3 100644
--- a/win32/libetext.def
+++ b/win32/libetext.def
@@ -1,10 +1,35 @@
 EXPORTS
+	e_repos_absolute
+	e_repos_clamp
 	e_repos_delete_shift
 	e_repos_insert_shift
+	e_repos_shift
+	e_text_cancel_editing
 	e_text_copy_clipboard
+	e_text_cut_clipboard
 	e_text_delete_selection
 	e_text_get_type
-	e_text_get_type
+	e_text_model_activate_nth_object
+	e_text_model_append
+	e_text_model_cancel_completion
+	e_text_model_changed
+	e_text_model_delete
+	e_text_model_get_nth_object
+	e_text_model_get_nth_object_bounds
+	e_text_model_get_object_at_offset
+	e_text_model_get_object_at_pointer
 	e_text_model_get_text
+	e_text_model_get_text_length
+	e_text_model_get_type
+	e_text_model_insert
+	e_text_model_insert_length
+	e_text_model_new
+	e_text_model_object_count
+	e_text_model_prepend
+	e_text_model_reposition
 	e_text_model_set_text
+	e_text_model_strdup_nth_object
+	e_text_model_validate_position
 	e_text_paste_clipboard
+	e_text_select_all
+	e_text_stop_editing
diff --git a/win32/libevolution-addressbook.def b/win32/libevolution-addressbook.def
index c29ec7fad9..6610055249 100644
--- a/win32/libevolution-addressbook.def
+++ b/win32/libevolution-addressbook.def
@@ -1,14 +1,155 @@
 EXPORTS
+	Bonobo_Plugin_info DATA
+	_eab_contact_merging_create_contact_display
+	addressbook_component_get_type
+	addressbook_component_peek
+	addressbook_component_peek_base_directory
+	addressbook_component_peek_gconf_client
+	addressbook_config_create_new_source
+	addressbook_config_edit_source
 	addressbook_load
 	addressbook_load_cancel
 	addressbook_load_default_book
+	addressbook_migrate
+	addressbook_view_edit_contact
+	addressbook_view_get_type
+	addressbook_view_new
+	addressbook_view_peek_activity_handler
+	addressbook_view_peek_folder_view
+	addressbook_view_peek_info_label
+	addressbook_view_peek_sidebar
+	addressbook_view_peek_statusbar
+	autocompletion_config_control_new
+	e_addressbook_reflow_adapter_construct
+	e_addressbook_reflow_adapter_get_contact
+	e_addressbook_reflow_adapter_get_type
+	e_addressbook_reflow_adapter_new
+	e_contact_print
+	e_contact_print_style_editor_get_type
+	e_contact_print_style_editor_new
 	e_minicard_activate_editor
+	e_minicard_compare
+	e_minicard_get_card_id
 	e_minicard_get_type
+	e_minicard_label_get_type
+	e_minicard_label_new
+	e_minicard_selected
+	e_minicard_view_get_card_list
 	e_minicard_view_get_type
+	e_minicard_view_jump_to_letter
+	e_minicard_view_remove_selection
+	e_minicard_view_widget_get_selection_model
+	e_minicard_view_widget_get_type
+	e_minicard_view_widget_get_view
+	e_minicard_view_widget_new
+	eab_config_get_type
+	eab_config_hook_get_type
+	eab_config_new
+	eab_config_target_new_source
+	eab_contact_compare
+	eab_contact_compare_address
+	eab_contact_compare_email
+	eab_contact_compare_file_as
+	eab_contact_compare_name
+	eab_contact_compare_name_to_string
+	eab_contact_compare_name_to_string_full
+	eab_contact_compare_nickname
+	eab_contact_compare_telephone
+	eab_contact_display_get_type
+	eab_contact_display_new
+	eab_contact_display_render
+	eab_contact_list_save
+	eab_contact_locate_match
+	eab_contact_locate_match_full
+	eab_contact_save
+	eab_create_image_chooser_widget
+	eab_error_dialog
 	eab_load_error_dialog
+	eab_marshal_INT__POINTER
+	eab_marshal_VOID__INT_INT
+	eab_menu_get_type
+	eab_menu_hook_get_type
+	eab_menu_new
+	eab_menu_target_new_select
 	eab_merging_book_add_contact
 	eab_merging_book_commit_contact
+	eab_model_can_stop
+	eab_model_contact_at
+	eab_model_contact_count
+	eab_model_editable
+	eab_model_force_folder_bar_message
+	eab_model_get_contact
+	eab_model_get_ebook
+	eab_model_get_type
+	eab_model_new
+	eab_model_stop
+	eab_parse_qp_email
+	eab_parse_qp_email_to_html
+	eab_popup_control_construct
+	eab_popup_control_get_type
+	eab_popup_control_new
+	eab_popup_get_type
+	eab_popup_hook_get_type
+	eab_popup_new
+	eab_popup_target_new_select
+	eab_popup_target_new_select_names
+	eab_popup_target_new_source
+	eab_popup_target_new_uri
 	eab_prompt_save_dialog
+	eab_search_result_dialog
+	eab_select_source
+	eab_send_contact
+	eab_send_contact_list
 	eab_show_contact_editor
 	eab_show_contact_list_editor
+	eab_show_multiple_contacts
+	eab_table_adapter_construct
+	eab_table_adapter_get_type
+	eab_table_adapter_new
+	eab_transfer_contacts
+	eab_vcard_control_new
+	eab_view_can_copy
+	eab_view_can_copy_to_folder
+	eab_view_can_create
+	eab_view_can_cut
+	eab_view_can_delete
+	eab_view_can_move_to_folder
+	eab_view_can_paste
+	eab_view_can_print
+	eab_view_can_save_as
+	eab_view_can_select_all
+	eab_view_can_send
+	eab_view_can_send_to
+	eab_view_can_stop
+	eab_view_can_view
+	eab_view_copy
+	eab_view_copy_to_folder
+	eab_view_cut
+	eab_view_delete_selection
+	eab_view_discard_menus
+	eab_view_get_menu_target
 	eab_view_get_type
+	eab_view_move_to_folder
+	eab_view_new
+	eab_view_paste
+	eab_view_peek_search_context
+	eab_view_peek_search_rule
+	eab_view_print
+	eab_view_save_as
+	eab_view_select_all
+	eab_view_send
+	eab_view_send_to
+	eab_view_setup_menus
+	eab_view_show_all
+	eab_view_show_contact_preview
+	eab_view_stop
+	eab_view_view
+	gal_view_factory_minicard_construct
+	gal_view_factory_minicard_get_type
+	gal_view_factory_minicard_new
+	gal_view_minicard_attach
+	gal_view_minicard_construct
+	gal_view_minicard_detach
+	gal_view_minicard_get_type
+	gal_view_minicard_new
+	supported_bases_create_table
diff --git a/win32/libevolution-calendar.def b/win32/libevolution-calendar.def
index ac9e2fb41d..b4cfde7282 100644
--- a/win32/libevolution-calendar.def
+++ b/win32/libevolution-calendar.def
@@ -1,30 +1,1122 @@
 EXPORTS
+	Bonobo_Plugin_info DATA
+	EMeetingTimeSelectorHours DATA
+	EMeetingTimeSelectorHours12 DATA
+	GNOME_Evolution_Calendar_AlarmNotify__classid DATA
+	GNOME_Evolution_Calendar_AlarmNotify__iinterface DATA
+	GNOME_Evolution_Calendar_CalFactory__classid DATA
+	GNOME_Evolution_Calendar_CalFactory__iinterface DATA
+	GNOME_Evolution_Calendar_CalFactory__imethods DATA
+	GNOME_Evolution_Calendar_CalFactory_getCal
+	GNOME_Evolution_Calendar_CalListener__classid DATA
+	GNOME_Evolution_Calendar_CalListener__iinterface DATA
+	GNOME_Evolution_Calendar_CalListener__imethods DATA
+	GNOME_Evolution_Calendar_CalListener_notifyAlarmDiscarded
+	GNOME_Evolution_Calendar_CalListener_notifyAlarmEmailAddress
+	GNOME_Evolution_Calendar_CalListener_notifyAttachmentListRequested
+	GNOME_Evolution_Calendar_CalListener_notifyAuthRequired
+	GNOME_Evolution_Calendar_CalListener_notifyCalAddress
+	GNOME_Evolution_Calendar_CalListener_notifyCalOpened
+	GNOME_Evolution_Calendar_CalListener_notifyCalRemoved
+	GNOME_Evolution_Calendar_CalListener_notifyCalSetMode
+	GNOME_Evolution_Calendar_CalListener_notifyChanges
+	GNOME_Evolution_Calendar_CalListener_notifyDefaultObjectRequested
+	GNOME_Evolution_Calendar_CalListener_notifyDefaultTimezoneSet
+	GNOME_Evolution_Calendar_CalListener_notifyErrorOccurred
+	GNOME_Evolution_Calendar_CalListener_notifyFreeBusy
+	GNOME_Evolution_Calendar_CalListener_notifyLDAPAttribute
+	GNOME_Evolution_Calendar_CalListener_notifyObjectCreated
+	GNOME_Evolution_Calendar_CalListener_notifyObjectListRequested
+	GNOME_Evolution_Calendar_CalListener_notifyObjectModified
+	GNOME_Evolution_Calendar_CalListener_notifyObjectRemoved
+	GNOME_Evolution_Calendar_CalListener_notifyObjectRequested
+	GNOME_Evolution_Calendar_CalListener_notifyObjectsReceived
+	GNOME_Evolution_Calendar_CalListener_notifyObjectsSent
+	GNOME_Evolution_Calendar_CalListener_notifyQuery
+	GNOME_Evolution_Calendar_CalListener_notifyReadOnly
+	GNOME_Evolution_Calendar_CalListener_notifyStaticCapabilities
+	GNOME_Evolution_Calendar_CalListener_notifyTimezoneAdded
+	GNOME_Evolution_Calendar_CalListener_notifyTimezoneRequested
+	GNOME_Evolution_Calendar_CalViewListener__classid DATA
+	GNOME_Evolution_Calendar_CalViewListener__iinterface DATA
+	GNOME_Evolution_Calendar_CalViewListener__imethods DATA
+	GNOME_Evolution_Calendar_CalViewListener_notifyObjectsAdded
+	GNOME_Evolution_Calendar_CalViewListener_notifyObjectsModified
+	GNOME_Evolution_Calendar_CalViewListener_notifyObjectsRemoved
+	GNOME_Evolution_Calendar_CalViewListener_notifyQueryDone
+	GNOME_Evolution_Calendar_CalViewListener_notifyQueryProgress
+	GNOME_Evolution_Calendar_CalView__classid DATA
+	GNOME_Evolution_Calendar_CalView__iinterface DATA
+	GNOME_Evolution_Calendar_CalView__imethods DATA
+	GNOME_Evolution_Calendar_CalView_start
+	GNOME_Evolution_Calendar_Cal__classid DATA
+	GNOME_Evolution_Calendar_Cal__get_uri
+	GNOME_Evolution_Calendar_Cal__iinterface DATA
+	GNOME_Evolution_Calendar_Cal__imethods DATA
+	GNOME_Evolution_Calendar_Cal_addTimezone
+	GNOME_Evolution_Calendar_Cal_createObject
+	GNOME_Evolution_Calendar_Cal_discardAlarm
+	GNOME_Evolution_Calendar_Cal_getAlarmEmailAddress
+	GNOME_Evolution_Calendar_Cal_getAttachmentList
+	GNOME_Evolution_Calendar_Cal_getCalAddress
+	GNOME_Evolution_Calendar_Cal_getChanges
+	GNOME_Evolution_Calendar_Cal_getDefaultObject
+	GNOME_Evolution_Calendar_Cal_getFreeBusy
+	GNOME_Evolution_Calendar_Cal_getLdapAttribute
+	GNOME_Evolution_Calendar_Cal_getObject
+	GNOME_Evolution_Calendar_Cal_getObjectList
+	GNOME_Evolution_Calendar_Cal_getQuery
+	GNOME_Evolution_Calendar_Cal_getStaticCapabilities
+	GNOME_Evolution_Calendar_Cal_getTimezone
+	GNOME_Evolution_Calendar_Cal_isReadOnly
+	GNOME_Evolution_Calendar_Cal_modifyObject
+	GNOME_Evolution_Calendar_Cal_open
+	GNOME_Evolution_Calendar_Cal_receiveObjects
+	GNOME_Evolution_Calendar_Cal_remove
+	GNOME_Evolution_Calendar_Cal_removeObject
+	GNOME_Evolution_Calendar_Cal_sendObjects
+	GNOME_Evolution_Calendar_Cal_setDefaultTimezone
+	GNOME_Evolution_Calendar_Cal_setMode
+	GNOME_Evolution_Calendar_CompEditorFactory__classid DATA
+	GNOME_Evolution_Calendar_CompEditorFactory__iinterface DATA
+	GNOME_Evolution_Calendar_CompEditorFactory__imethods DATA
+	GNOME_Evolution_Calendar_CompEditorFactory_editExisting
+	GNOME_Evolution_Calendar_CompEditorFactory_editNew
+	POA_GNOME_Evolution_Calendar_AlarmNotify__fini
+	POA_GNOME_Evolution_Calendar_AlarmNotify__init
+	POA_GNOME_Evolution_Calendar_CalFactory__fini
+	POA_GNOME_Evolution_Calendar_CalFactory__init
+	POA_GNOME_Evolution_Calendar_CalListener__fini
+	POA_GNOME_Evolution_Calendar_CalListener__init
+	POA_GNOME_Evolution_Calendar_CalViewListener__fini
+	POA_GNOME_Evolution_Calendar_CalViewListener__init
+	POA_GNOME_Evolution_Calendar_CalView__fini
+	POA_GNOME_Evolution_Calendar_CalView__init
+	POA_GNOME_Evolution_Calendar_Cal__fini
+	POA_GNOME_Evolution_Calendar_Cal__init
+	POA_GNOME_Evolution_Calendar_CompEditorFactory__fini
+	POA_GNOME_Evolution_Calendar_CompEditorFactory__init
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjID_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjInstance_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_CalObj_struct DATA
+	TC_CORBA_sequence_GNOME_Evolution_Calendar_User_struct DATA
+	TC_GNOME_Evolution_Calendar_AlarmNotify_struct DATA
+	TC_GNOME_Evolution_Calendar_CalAlarmUID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_InvalidURI_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_NilListener_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod_struct DATA
+	TC_GNOME_Evolution_Calendar_CalFactory_struct DATA
+	TC_GNOME_Evolution_Calendar_CalListener_SetModeStatus_struct DATA
+	TC_GNOME_Evolution_Calendar_CalListener_struct DATA
+	TC_GNOME_Evolution_Calendar_CalMode_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjChangeSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjChangeType_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjChange_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjIDSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjInstanceSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjInstance_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjModType_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjType_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjUIDSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObjUID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalObj_struct DATA
+	TC_GNOME_Evolution_Calendar_CalRecurID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalTimezoneObjUID_struct DATA
+	TC_GNOME_Evolution_Calendar_CalTimezoneObj_struct DATA
+	TC_GNOME_Evolution_Calendar_CalViewListener_struct DATA
+	TC_GNOME_Evolution_Calendar_CalView_struct DATA
+	TC_GNOME_Evolution_Calendar_Cal_InvalidRange_struct DATA
+	TC_GNOME_Evolution_Calendar_Cal_NotFound_struct DATA
+	TC_GNOME_Evolution_Calendar_Cal_struct DATA
+	TC_GNOME_Evolution_Calendar_CallStatus_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_BackendContactError_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_InvalidURI_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_UnsupportedType_struct DATA
+	TC_GNOME_Evolution_Calendar_CompEditorFactory_struct DATA
+	TC_GNOME_Evolution_Calendar_StringSeq_struct DATA
+	TC_GNOME_Evolution_Calendar_Time_t_struct DATA
+	TC_GNOME_Evolution_Calendar_UserList_struct DATA
+	TC_GNOME_Evolution_Calendar_User_struct DATA
+	TC_GNOME_Evolution_Calendar_stringlist_struct DATA
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalFactory_getCal
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAlarmDiscarded
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAlarmEmailAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAttachmentListRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyAuthRequired
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalOpened
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalRemoved
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyCalSetMode
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyChanges
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyDefaultObjectRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyDefaultTimezoneSet
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyErrorOccurred
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyFreeBusy
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyLDAPAttribute
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectCreated
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectListRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectModified
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectRemoved
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectsReceived
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyObjectsSent
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyQuery
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyReadOnly
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyStaticCapabilities
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyTimezoneAdded
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalListener_notifyTimezoneRequested
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyObjectsAdded
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyObjectsModified
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyObjectsRemoved
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyQueryDone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalViewListener_notifyQueryProgress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CalView_start
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal__get_uri
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_addTimezone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_createObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_discardAlarm
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getAlarmEmailAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getAttachmentList
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getCalAddress
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getChanges
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getDefaultObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getFreeBusy
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getLdapAttribute
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getObjectList
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getQuery
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getStaticCapabilities
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_getTimezone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_isReadOnly
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_modifyObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_open
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_receiveObjects
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_remove
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_removeObject
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_sendObjects
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_setDefaultTimezone
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_Cal_setMode
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CompEditorFactory_editExisting
+	_ORBIT_skel_small_GNOME_Evolution_Calendar_CompEditorFactory_editNew
+	alarm_dialog_run
+	alarm_list_dialog_peek
+	alarm_list_dialog_run
+	alarm_list_dialog_set_client
+	auth_cal_forget_password
+	auth_new_cal_from_default
+	auth_new_cal_from_source
+	auth_new_cal_from_uri
+	cal_comp_event_new_with_current_time
+	cal_comp_event_new_with_defaults
+	cal_comp_is_on_server
+	cal_comp_memo_new_with_defaults
+	cal_comp_process_source_list_drop
+	cal_comp_selection_get_string_list
+	cal_comp_selection_set_string_list
+	cal_comp_set_dtend_with_oldzone
+	cal_comp_set_dtstart_with_oldzone
+	cal_comp_task_new_with_defaults
+	cal_comp_util_add_exdate
+	cal_comp_util_compare_event_timezones
+	cal_comp_util_get_n_icons
+	cal_prefs_dialog_create_time_edit
+	cal_search_bar_construct
+	cal_search_bar_get_category
+	cal_search_bar_get_time_range
+	cal_search_bar_get_type
+	cal_search_bar_new
+	cal_search_bar_set_categories
+	calculate_time
+	calendar_command_print
+	calendar_component_get_type
+	calendar_component_peek
+	calendar_component_peek_activity_handler
+	calendar_component_peek_base_directory
+	calendar_component_peek_config_directory
+	calendar_component_peek_source_list
+	calendar_component_show_logger
+	calendar_config_add_notification_24_hour_format
+	calendar_config_add_notification_calendars_selected
+	calendar_config_add_notification_compress_weekend
+	calendar_config_add_notification_day_end_hour
+	calendar_config_add_notification_day_end_minute
+	calendar_config_add_notification_day_second_zone
+	calendar_config_add_notification_day_start_hour
+	calendar_config_add_notification_day_start_minute
+	calendar_config_add_notification_daylight_saving
+	calendar_config_add_notification_dnav_show_week_no
+	calendar_config_add_notification_dview_show_week_no
+	calendar_config_add_notification_free_busy_template
+	calendar_config_add_notification_hide_completed_tasks
+	calendar_config_add_notification_hide_completed_tasks_units
+	calendar_config_add_notification_hide_completed_tasks_value
+	calendar_config_add_notification_marcus_bains
+	calendar_config_add_notification_memos_selected
+	calendar_config_add_notification_preview_state
+	calendar_config_add_notification_primary_calendar
+	calendar_config_add_notification_primary_memos
+	calendar_config_add_notification_primary_tasks
+	calendar_config_add_notification_show_event_end
+	calendar_config_add_notification_tasks_selected
+	calendar_config_add_notification_time_divisions
+	calendar_config_add_notification_timezone
+	calendar_config_add_notification_week_start_day
+	calendar_config_add_notification_working_days
+	calendar_config_free_day_second_zones
+	calendar_config_get_24_hour_format
+	calendar_config_get_ba_reminder
+	calendar_config_get_calendars_selected
+	calendar_config_get_compress_weekend
+	calendar_config_get_confirm_delete
+	calendar_config_get_confirm_purge
+	calendar_config_get_day_end_hour
+	calendar_config_get_day_end_minute
+	calendar_config_get_day_second_zone
+	calendar_config_get_day_second_zones
+	calendar_config_get_day_start_hour
+	calendar_config_get_day_start_minute
+	calendar_config_get_daylight_saving
+	calendar_config_get_default_reminder_interval
+	calendar_config_get_default_reminder_units
+	calendar_config_get_dir_path
+	calendar_config_get_dnav_show_week_no
+	calendar_config_get_dview_show_week_no
+	calendar_config_get_free_busy_template
+	calendar_config_get_hide_completed_tasks
+	calendar_config_get_hide_completed_tasks_sexp
+	calendar_config_get_hide_completed_tasks_units
+	calendar_config_get_hide_completed_tasks_value
+	calendar_config_get_hpane_pos
+	calendar_config_get_icaltimezone
+	calendar_config_get_marcus_bains
+	calendar_config_get_memos_selected
+	calendar_config_get_month_hpane_pos
+	calendar_config_get_month_vpane_pos
+	calendar_config_get_preview_state
+	calendar_config_get_primary_calendar
+	calendar_config_get_primary_memos
+	calendar_config_get_primary_tasks
+	calendar_config_get_show_categories
+	calendar_config_get_show_event_end
+	calendar_config_get_show_role
+	calendar_config_get_show_rsvp
+	calendar_config_get_show_status
+	calendar_config_get_show_timezone
+	calendar_config_get_show_type
+	calendar_config_get_tag_vpane_pos
+	calendar_config_get_task_vpane_pos
+	calendar_config_get_tasks_due_today_color
+	calendar_config_get_tasks_overdue_color
+	calendar_config_get_tasks_selected
+	calendar_config_get_time_divisions
+	calendar_config_get_timezone
+	calendar_config_get_use_default_reminder
+	calendar_config_get_vpane_pos
+	calendar_config_get_week_start_day
+	calendar_config_get_working_days
+	calendar_config_locale_supports_12_hour_format
+	calendar_config_remove_notification
+	calendar_config_select_day_second_zone
+	calendar_config_set_24_hour_format
+	calendar_config_set_ba_reminder
+	calendar_config_set_calendars_selected
+	calendar_config_set_compress_weekend
+	calendar_config_set_confirm_delete
+	calendar_config_set_confirm_purge
+	calendar_config_set_day_end_hour
+	calendar_config_set_day_end_minute
+	calendar_config_set_day_second_zone
+	calendar_config_set_day_start_hour
+	calendar_config_set_day_start_minute
+	calendar_config_set_daylight_saving
+	calendar_config_set_default_reminder_interval
+	calendar_config_set_default_reminder_units
+	calendar_config_set_dir_path
+	calendar_config_set_dnav_show_week_no
+	calendar_config_set_dview_show_week_no
+	calendar_config_set_free_busy_template
+	calendar_config_set_hide_completed_tasks
+	calendar_config_set_hide_completed_tasks_units
+	calendar_config_set_hide_completed_tasks_value
+	calendar_config_set_hpane_pos
+	calendar_config_set_memos_selected
+	calendar_config_set_month_hpane_pos
+	calendar_config_set_month_vpane_pos
+	calendar_config_set_preview_state
+	calendar_config_set_primary_calendar
+	calendar_config_set_primary_memos
+	calendar_config_set_primary_tasks
+	calendar_config_set_show_categories
+	calendar_config_set_show_event_end
+	calendar_config_set_show_role
+	calendar_config_set_show_rsvp
+	calendar_config_set_show_status
+	calendar_config_set_show_timezone
+	calendar_config_set_show_type
+	calendar_config_set_tag_vpane_pos
+	calendar_config_set_task_vpane_pos
+	calendar_config_set_tasks_due_today_color
+	calendar_config_set_tasks_overdue_color
+	calendar_config_set_tasks_selected
+	calendar_config_set_time_divisions
+	calendar_config_set_timezone
+	calendar_config_set_use_default_reminder
+	calendar_config_set_vpane_pos
+	calendar_config_set_week_start_day
+	calendar_config_set_working_days
+	calendar_control_activate
+	calendar_control_deactivate
+	calendar_control_sensitize_calendar_commands
+	calendar_goto_today
+	calendar_prefs_dialog_get_type
+	calendar_prefs_dialog_new
+	calendar_setup_edit_calendar
+	calendar_setup_edit_memo_list
+	calendar_setup_edit_task_list
+	calendar_setup_new_calendar
+	calendar_setup_new_memo_list
+	calendar_setup_new_task_list
+	calendar_view_construct
+	calendar_view_factory_construct
+	calendar_view_factory_get_type
+	calendar_view_factory_new
+	calendar_view_get_type
+	calendar_view_get_view_type
+	calendar_view_new
+	cancel_component_dialog
+	changed_component_dialog
+	comp_editor_append_page
+	comp_editor_close
+	comp_editor_date_label
+	comp_editor_dates
+	comp_editor_delete_comp
+	comp_editor_edit_comp
+	comp_editor_factory_get_type
+	comp_editor_factory_new
+	comp_editor_free_dates
+	comp_editor_get_action
+	comp_editor_get_action_group
+	comp_editor_get_changed
+	comp_editor_get_classification
+	comp_editor_get_client
+	comp_editor_get_comp
+	comp_editor_get_current_comp
+	comp_editor_get_current_time
+	comp_editor_get_existing_org
+	comp_editor_get_flags
+	comp_editor_get_group_item
+	comp_editor_get_managed_widget
+	comp_editor_get_mime_attach_list
+	comp_editor_get_needs_send
+	comp_editor_get_summary
+	comp_editor_get_type
+	comp_editor_get_ui_manager
+	comp_editor_get_user_org
+	comp_editor_new_date_edit
+	comp_editor_page_changed
+	comp_editor_page_display_validation_error
+	comp_editor_page_fill_component
+	comp_editor_page_fill_timezones
+	comp_editor_page_fill_widgets
+	comp_editor_page_focus_main_widget
+	comp_editor_page_get_editor
+	comp_editor_page_get_type
+	comp_editor_page_get_updating
+	comp_editor_page_get_widget
+	comp_editor_page_notify_dates_changed
+	comp_editor_page_set_dates
+	comp_editor_page_set_updating
+	comp_editor_registry DATA
+	comp_editor_remove_page
+	comp_editor_save_comp
+	comp_editor_select_file
+	comp_editor_select_file_attachments
+	comp_editor_send_comp
+	comp_editor_set_changed
+	comp_editor_set_classification
+	comp_editor_set_client
+	comp_editor_set_existing_org
+	comp_editor_set_flags
+	comp_editor_set_group_item
+	comp_editor_set_needs_send
+	comp_editor_set_summary
+	comp_editor_set_user_org
+	comp_editor_show_page
+	comp_editor_strip_categories
+	comp_util_sanitize_recurrence_master
+	control_factory_new_control
+	copy_source_dialog
+	delete_component_dialog
+	delete_error_dialog
+	draw_curved_rectangle
+	e_alarm_list_append
+	e_alarm_list_clear
+	e_alarm_list_get_alarm
+	e_alarm_list_get_type
+	e_alarm_list_new
+	e_alarm_list_remove
+	e_alarm_list_set_alarm
+	e_cal_comp_preview_url_requested_cb
+	e_cal_component_memo_preview_clear
+	e_cal_component_memo_preview_display
+	e_cal_component_memo_preview_get_default_timezone
+	e_cal_component_memo_preview_get_html
+	e_cal_component_memo_preview_get_type
+	e_cal_component_memo_preview_new
+	e_cal_component_memo_preview_set_default_timezone
+	e_cal_component_preview_clear
+	e_cal_component_preview_display
+	e_cal_component_preview_get_default_timezone
+	e_cal_component_preview_get_html
+	e_cal_component_preview_get_type
+	e_cal_component_preview_new
+	e_cal_component_preview_set_default_timezone
+	e_cal_config_get_type
+	e_cal_config_hook_get_type
+	e_cal_config_new
+	e_cal_config_target_new_prefs
+	e_cal_config_target_new_source
+	e_cal_event_get_type
+	e_cal_event_hook_get_type
+	e_cal_event_peek
+	e_cal_event_target_new_component
+	e_cal_list_view_config_get_type
+	e_cal_list_view_config_get_view
+	e_cal_list_view_config_new
+	e_cal_list_view_config_set_view
+	e_cal_list_view_construct
+	e_cal_list_view_get_range_shown
+	e_cal_list_view_get_type
+	e_cal_list_view_load_state
+	e_cal_list_view_new
+	e_cal_list_view_save_state
+	e_cal_menu_get_type
+	e_cal_menu_hook_get_type
+	e_cal_menu_new
+	e_cal_menu_target_new_select
+	e_cal_model_add_client
+	e_cal_model_calendar_get_type
+	e_cal_model_calendar_new
+	e_cal_model_component_get_type
+	e_cal_model_copy_component_data
+	e_cal_model_create_component_with_defaults
+	e_cal_model_date_value_to_string
+	e_cal_model_free_component_data
+	e_cal_model_generate_instances
+	e_cal_model_get_client_for_uri
+	e_cal_model_get_client_list
+	e_cal_model_get_color_for_component
+	e_cal_model_get_component_at
+	e_cal_model_get_component_for_uid
+	e_cal_model_get_component_kind
+	e_cal_model_get_default_client
+	e_cal_model_get_flags
+	e_cal_model_get_object_array
+	e_cal_model_get_rgb_color_for_component
+	e_cal_model_get_search_query
+	e_cal_model_get_time_range
+	e_cal_model_get_timezone
+	e_cal_model_get_type
+	e_cal_model_get_use_24_hour_format
+	e_cal_model_memos_get_type
+	e_cal_model_memos_new
+	e_cal_model_remove_all_clients
+	e_cal_model_remove_client
+	e_cal_model_set_component_kind
+	e_cal_model_set_default_category
+	e_cal_model_set_default_client
+	e_cal_model_set_default_time_func
+	e_cal_model_set_flags
+	e_cal_model_set_instance_times
+	e_cal_model_set_search_query
+	e_cal_model_set_search_query_with_time_range
+	e_cal_model_set_time_range
+	e_cal_model_set_timezone
+	e_cal_model_set_use_24_hour_format
+	e_cal_model_tasks_get_type
+	e_cal_model_tasks_mark_comp_complete
+	e_cal_model_tasks_mark_comp_incomplete
+	e_cal_model_tasks_new
+	e_cal_model_tasks_update_due_tasks
+	e_cal_model_test_row_editable
+	e_cal_popup_get_type
+	e_cal_popup_hook_get_type
+	e_cal_popup_new
+	e_cal_popup_target_new_attachments
+	e_cal_popup_target_new_select
+	e_cal_popup_target_new_source
+	e_calendar_marshal_VOID__ENUM_ENUM
+	e_calendar_marshal_VOID__ENUM_STRING
+	e_calendar_marshal_VOID__INT_BOOLEAN
+	e_calendar_marshal_VOID__INT_INT
+	e_calendar_marshal_VOID__INT_OBJECT
+	e_calendar_marshal_VOID__INT_POINTER
+	e_calendar_marshal_VOID__INT_STRING
+	e_calendar_marshal_VOID__LONG_LONG
+	e_calendar_marshal_VOID__POINTER_ENUM
+	e_calendar_marshal_VOID__POINTER_POINTER
+	e_calendar_marshal_VOID__POINTER_STRING
+	e_calendar_marshal_VOID__STRING_BOOLEAN_INT_INT
+	e_calendar_marshal_VOID__STRING_INT
+	e_calendar_marshal_VOID__STRING_INT_INT
+	e_calendar_marshal_VOID__STRING_POINTER_POINTER
+	e_calendar_marshal_VOID__STRING_STRING
+	e_calendar_marshal_VOID__STRING_STRING_STRING
+	e_calendar_table_complete_selected
+	e_calendar_table_config_get_table
+	e_calendar_table_config_get_type
+	e_calendar_table_config_new
+	e_calendar_table_config_set_table
+	e_calendar_table_copy_clipboard
+	e_calendar_table_cut_clipboard
+	e_calendar_table_delete_selected
+	e_calendar_table_get_model
+	e_calendar_table_get_selected
+	e_calendar_table_get_selected_comp
+	e_calendar_table_get_table
+	e_calendar_table_get_type
+	e_calendar_table_load_state
+	e_calendar_table_new
+	e_calendar_table_open_selected
+	e_calendar_table_open_task
+	e_calendar_table_paste_clipboard
+	e_calendar_table_process_completed_tasks
+	e_calendar_table_save_state
+	e_calendar_table_set_activity_handler
+	e_calendar_table_set_status_message
+	e_calendar_utils_show_error_silent
+	e_calendar_utils_show_info_silent
+	e_calendar_view_add_event
+	e_calendar_view_copy_clipboard
+	e_calendar_view_create_popup_menu
+	e_calendar_view_cut_clipboard
+	e_calendar_view_delete_selected_event
+	e_calendar_view_delete_selected_events
+	e_calendar_view_delete_selected_occurrence
+	e_calendar_view_edit_appointment
+	e_calendar_view_get_attendees_status_info
 	e_calendar_view_get_calendar
+	e_calendar_view_get_default_category
+	e_calendar_view_get_icalcomponent_summary
+	e_calendar_view_get_model
+	e_calendar_view_get_selected_events
 	e_calendar_view_get_selected_time_range
+	e_calendar_view_get_timezone
+	e_calendar_view_get_tooltips
 	e_calendar_view_get_type
+	e_calendar_view_get_use_24_hour_format
+	e_calendar_view_get_visible_time_range
+	e_calendar_view_modify_and_send
+	e_calendar_view_move_tip
 	e_calendar_view_new_appointment
 	e_calendar_view_new_appointment_for
+	e_calendar_view_new_appointment_full
+	e_calendar_view_open_event
+	e_calendar_view_paste_clipboard
+	e_calendar_view_set_activity_handler
+	e_calendar_view_set_calendar
+	e_calendar_view_set_default_category
+	e_calendar_view_set_model
+	e_calendar_view_set_selected_time_range
+	e_calendar_view_set_status_message
+	e_calendar_view_set_timezone
+	e_calendar_view_set_use_24_hour_format
+	e_calendar_view_update_query
+	e_cell_date_edit_config_get_cell
+	e_cell_date_edit_config_get_type
+	e_cell_date_edit_config_new
+	e_cell_date_edit_config_set_cell
+	e_cell_date_edit_text_get_type
+	e_cell_date_edit_text_new
+	e_cell_date_edit_text_set_timezone
+	e_cell_date_edit_text_set_use_24_hour_format
+	e_comp_editor_registry_add
+	e_comp_editor_registry_close_all
+	e_comp_editor_registry_find
+	e_comp_editor_registry_get_type
+	e_comp_editor_registry_new
+	e_date_edit_config_get_edit
+	e_date_edit_config_get_type
+	e_date_edit_config_new
+	e_date_edit_config_set_edit
+	e_date_time_list_append
+	e_date_time_list_clear
+	e_date_time_list_get_date_time
+	e_date_time_list_get_type
+	e_date_time_list_new
+	e_date_time_list_remove
+	e_date_time_list_set_date_time
+	e_day_view_check_auto_scroll
+	e_day_view_check_layout
+	e_day_view_config_get_type
+	e_day_view_config_get_view
+	e_day_view_config_new
+	e_day_view_config_set_view
 	e_day_view_convert_time_to_display
+	e_day_view_convert_time_to_position
+	e_day_view_convert_time_to_row
 	e_day_view_ensure_rows_visible
+	e_day_view_event_sort_func
 	e_day_view_find_event_from_item
+	e_day_view_find_long_event_days
+	e_day_view_finish_selection
+	e_day_view_get_days_shown
 	e_day_view_get_event_position
+	e_day_view_get_event_rows
 	e_day_view_get_long_event_position
+	e_day_view_get_mins_per_row
+	e_day_view_get_num_events_selected
+	e_day_view_get_show_event_end_times
+	e_day_view_get_show_marcus_bains
+	e_day_view_get_show_week_number
+	e_day_view_get_time_string_width
 	e_day_view_get_type
+	e_day_view_get_week_start_day
+	e_day_view_get_work_week_view
+	e_day_view_get_working_day
+	e_day_view_get_working_days
+	e_day_view_layout_day_events
+	e_day_view_layout_long_events
 	e_day_view_main_item_get_type
+	e_day_view_new
+	e_day_view_set_days_shown
+	e_day_view_set_marcus_bains
+	e_day_view_set_mins_per_row
+	e_day_view_set_show_event_end_times
+	e_day_view_set_show_week_number
+	e_day_view_set_week_start_day
+	e_day_view_set_work_week_view
+	e_day_view_set_working_day
+	e_day_view_set_working_days
+	e_day_view_start_selection
+	e_day_view_stop_auto_scroll
+	e_day_view_time_item_get_column_width
+	e_day_view_time_item_get_type
 	e_day_view_top_item_get_day_label
+	e_day_view_top_item_get_type
 	e_day_view_update_calendar_selection_time
+	e_day_view_update_marcus_bains
+	e_day_view_update_selection
+	e_delegate_dialog_construct
+	e_delegate_dialog_get_delegate
+	e_delegate_dialog_get_delegate_name
+	e_delegate_dialog_get_toplevel
+	e_delegate_dialog_get_type
+	e_delegate_dialog_new
+	e_itip_control_get_calendar_uid
+	e_itip_control_get_data
+	e_itip_control_get_data_size
+	e_itip_control_get_delegator_address
+	e_itip_control_get_delegator_name
+	e_itip_control_get_from_address
+	e_itip_control_get_type
+	e_itip_control_get_view_only
+	e_itip_control_new
+	e_itip_control_set_calendar_uid
+	e_itip_control_set_data
+	e_itip_control_set_delegator_address
+	e_itip_control_set_delegator_name
+	e_itip_control_set_from_address
+	e_itip_control_set_view_only
+	e_meeting_attendee_add_busy_period
+	e_meeting_attendee_as_e_cal_component_attendee
+	e_meeting_attendee_clear_busy_periods
+	e_meeting_attendee_find_first_busy_period
+	e_meeting_attendee_get_address
+	e_meeting_attendee_get_atype
+	e_meeting_attendee_get_busy_periods
+	e_meeting_attendee_get_cn
+	e_meeting_attendee_get_cutype
+	e_meeting_attendee_get_delfrom
+	e_meeting_attendee_get_delto
+	e_meeting_attendee_get_edit_level
+	e_meeting_attendee_get_end_busy_range
+	e_meeting_attendee_get_fburi
+	e_meeting_attendee_get_has_calendar_info
+	e_meeting_attendee_get_language
+	e_meeting_attendee_get_member
+	e_meeting_attendee_get_role
+	e_meeting_attendee_get_rsvp
+	e_meeting_attendee_get_sentby
+	e_meeting_attendee_get_start_busy_range
+	e_meeting_attendee_get_status
+	e_meeting_attendee_get_type
+	e_meeting_attendee_is_set_address
+	e_meeting_attendee_is_set_cn
+	e_meeting_attendee_is_set_delfrom
+	e_meeting_attendee_is_set_delto
+	e_meeting_attendee_is_set_language
+	e_meeting_attendee_is_set_member
+	e_meeting_attendee_is_set_sentby
+	e_meeting_attendee_new
+	e_meeting_attendee_new_from_e_cal_component_attendee
+	e_meeting_attendee_set_address
+	e_meeting_attendee_set_cn
+	e_meeting_attendee_set_cutype
+	e_meeting_attendee_set_delfrom
+	e_meeting_attendee_set_delto
+	e_meeting_attendee_set_edit_level
+	e_meeting_attendee_set_end_busy_range
+	e_meeting_attendee_set_fburi
+	e_meeting_attendee_set_has_calendar_info
+	e_meeting_attendee_set_language
+	e_meeting_attendee_set_member
+	e_meeting_attendee_set_role
+	e_meeting_attendee_set_rsvp
+	e_meeting_attendee_set_sentby
+	e_meeting_attendee_set_start_busy_range
+	e_meeting_attendee_set_status
+	e_meeting_list_view_add_attendee_to_name_selector
+	e_meeting_list_view_column_set_visible
+	e_meeting_list_view_edit
+	e_meeting_list_view_get_name_selector
+	e_meeting_list_view_get_type
+	e_meeting_list_view_invite_others_dialog
+	e_meeting_list_view_new
+	e_meeting_list_view_remove_all_attendees_from_name_selector
+	e_meeting_list_view_remove_attendee_from_name_selector
+	e_meeting_list_view_set_editable
+	e_meeting_list_view_set_name_selector
+	e_meeting_store_add_attendee
+	e_meeting_store_add_attendee_with_defaults
+	e_meeting_store_count_actual_attendees
+	e_meeting_store_find_attendee
+	e_meeting_store_find_attendee_at_row
+	e_meeting_store_find_attendee_path
+	e_meeting_store_get_attendees
+	e_meeting_store_get_e_cal
+	e_meeting_store_get_fb_uri
+	e_meeting_store_get_num_queries
+	e_meeting_store_get_type
+	e_meeting_store_get_zone
+	e_meeting_store_new
+	e_meeting_store_refresh_all_busy_periods
+	e_meeting_store_refresh_busy_periods
+	e_meeting_store_remove_all_attendees
+	e_meeting_store_remove_attendee
+	e_meeting_store_set_e_cal
+	e_meeting_store_set_fb_uri
+	e_meeting_store_set_value
+	e_meeting_store_set_zone
+	e_meeting_time_compare_times
+	e_meeting_time_selector_calculate_day_and_position
+	e_meeting_time_selector_calculate_time
+	e_meeting_time_selector_calculate_time_position
+	e_meeting_time_selector_construct
+	e_meeting_time_selector_convert_day_position_to_hours_and_mins
+	e_meeting_time_selector_drag_meeting_time
+	e_meeting_time_selector_fix_time_overflows
+	e_meeting_time_selector_get_autopick_option
+	e_meeting_time_selector_get_meeting_time
+	e_meeting_time_selector_get_meeting_time_positions
+	e_meeting_time_selector_get_type
+	e_meeting_time_selector_item_get_type
+	e_meeting_time_selector_item_set_normal_cursor
+	e_meeting_time_selector_new
+	e_meeting_time_selector_refresh_free_busy
+	e_meeting_time_selector_remove_timeout
+	e_meeting_time_selector_set_all_day
+	e_meeting_time_selector_set_autopick_option
+	e_meeting_time_selector_set_meeting_time
+	e_meeting_time_selector_set_read_only
+	e_meeting_time_selector_set_working_hours
+	e_meeting_time_selector_set_working_hours_only
+	e_meeting_time_selector_set_zoomed_out
+	e_memo_table_config_get_table
+	e_memo_table_config_get_type
+	e_memo_table_config_new
+	e_memo_table_config_set_table
+	e_memo_table_copy_clipboard
+	e_memo_table_cut_clipboard
+	e_memo_table_delete_selected
+	e_memo_table_get_model
+	e_memo_table_get_selected
+	e_memo_table_get_table
+	e_memo_table_get_type
+	e_memo_table_load_state
+	e_memo_table_new
+	e_memo_table_open_selected
+	e_memo_table_paste_clipboard
+	e_memo_table_save_state
+	e_memo_table_set_activity_handler
+	e_memo_table_set_status_message
+	e_memos_add_memo_source
+	e_memos_delete_selected
+	e_memos_discard_view_menus
+	e_memos_get_calendar_table
+	e_memos_get_default_client
+	e_memos_get_preview
+	e_memos_get_type
+	e_memos_new
+	e_memos_new_memo
+	e_memos_open_memo
+	e_memos_remove_memo_source
+	e_memos_set_default_source
+	e_memos_set_ui_component
+	e_memos_setup_view_menus
+	e_mini_calendar_config_get_calendar
+	e_mini_calendar_config_get_type
+	e_mini_calendar_config_new
+	e_mini_calendar_config_set_calendar
+	e_select_names_editable_get_email
+	e_select_names_editable_get_emails
+	e_select_names_editable_get_name
+	e_select_names_editable_get_names
+	e_select_names_editable_get_type
+	e_select_names_editable_new
+	e_select_names_editable_set_address
+	e_select_names_renderer_get_type
+	e_select_names_renderer_new
+	e_sendoptions_utils_fill_component
+	e_sendoptions_utils_set_default_data
+	e_tasks_add_todo_source
+	e_tasks_complete_selected
+	e_tasks_delete_completed
+	e_tasks_delete_selected
+	e_tasks_discard_view_menus
+	e_tasks_get_calendar_table
+	e_tasks_get_default_client
+	e_tasks_get_preview
+	e_tasks_get_tasks_menu
+	e_tasks_get_type
+	e_tasks_new
+	e_tasks_new_task
+	e_tasks_open_task
+	e_tasks_open_task_id
+	e_tasks_remove_todo_source
+	e_tasks_set_default_source
+	e_tasks_set_ui_component
+	e_tasks_setup_view_menus
+	e_tasks_show_preview
+	e_timezone_entry_get_timezone
+	e_timezone_entry_get_type
+	e_timezone_entry_new
+	e_timezone_entry_set_default_timezone
+	e_timezone_entry_set_timezone
+	e_week_view_config_get_type
+	e_week_view_config_get_view
+	e_week_view_config_new
+	e_week_view_config_set_view
+	e_week_view_convert_time_to_display
+	e_week_view_event_item_get_type
+	e_week_view_event_sort_func
 	e_week_view_find_event_from_item
+	e_week_view_get_compress_weekend
+	e_week_view_get_day_position
+	e_week_view_get_first_day_shown
+	e_week_view_get_multi_week_view
+	e_week_view_get_num_events_selected
+	e_week_view_get_show_event_end_times
 	e_week_view_get_span_position
+	e_week_view_get_time_string_width
 	e_week_view_get_type
+	e_week_view_get_update_base_date
+	e_week_view_get_week_start_day
+	e_week_view_get_weeks_shown
+	e_week_view_is_jump_button_visible
+	e_week_view_is_one_day_event
 	e_week_view_jump_to_button_item
+	e_week_view_layout_events
+	e_week_view_layout_get_day_position
+	e_week_view_layout_get_span_position
 	e_week_view_main_item_get_type
+	e_week_view_new
+	e_week_view_set_compress_weekend
+	e_week_view_set_first_day_shown
+	e_week_view_set_multi_week_view
+	e_week_view_set_selected_time_range_visible
+	e_week_view_set_show_event_end_times
+	e_week_view_set_update_base_date
+	e_week_view_set_week_start_day
+	e_week_view_set_weeks_shown
+	e_week_view_show_popup_menu
+	e_week_view_start_editing_event
+	e_week_view_stop_editing_event
+	e_week_view_titles_item_get_type
+	ec_query_tooltip
+	ev DATA
+	event_editor_get_type
+	event_editor_new
+	event_editor_show_meeting
+	event_page_add_attendee
+	event_page_construct
+	event_page_create_source_combo_box
+	event_page_get_cancel_comp
+	event_page_get_name_selector
+	event_page_get_type
+	event_page_hide_options
+	event_page_new
+	event_page_remove_all_attendees
+	event_page_sendoptions_clicked_cb
+	event_page_set_all_day_event
+	event_page_set_delegate
+	event_page_set_info_string
+	event_page_set_meeting
+	event_page_set_show_categories
+	event_page_set_show_time_busy
+	event_page_set_show_timezone
+	event_page_set_view_role
+	event_page_set_view_rsvp
+	event_page_set_view_status
+	event_page_set_view_type
+	event_page_show_alarm
+	event_page_show_options
+	get_position_in_array
+	get_uri_without_password
+	gnome_calendar_add_source
+	gnome_calendar_construct
+	gnome_calendar_copy_clipboard
+	gnome_calendar_cut_clipboard
+	gnome_calendar_dayjump
+	gnome_calendar_delete_selected_occurrence
+	gnome_calendar_delete_selection
+	gnome_calendar_discard_view_menus
+	gnome_calendar_edit_appointment
+	gnome_calendar_emit_user_created_signal
+	gnome_calendar_get_calendar_menu
+	gnome_calendar_get_calendar_model
+	gnome_calendar_get_current_time_range
 	gnome_calendar_get_current_view_widget
+	gnome_calendar_get_default_client
 	gnome_calendar_get_e_calendar_widget
+	gnome_calendar_get_memopad_menu
+	gnome_calendar_get_num_events_selected
+	gnome_calendar_get_num_tasks_selected
 	gnome_calendar_get_search_bar_widget
+	gnome_calendar_get_selected_time_range
+	gnome_calendar_get_tag
 	gnome_calendar_get_task_pad
+	gnome_calendar_get_taskpad_menu
 	gnome_calendar_get_timezone
 	gnome_calendar_get_type
 	gnome_calendar_get_view
 	gnome_calendar_get_view_notebook_widget
 	gnome_calendar_get_visible_time_range
+	gnome_calendar_goto
+	gnome_calendar_goto_today
+	gnome_calendar_new
+	gnome_calendar_new_task
+	gnome_calendar_next
+	gnome_calendar_paste_clipboard
+	gnome_calendar_previous
+	gnome_calendar_purge
+	gnome_calendar_remove_source
+	gnome_calendar_remove_source_by_uid
+	gnome_calendar_set_activity_handler
+	gnome_calendar_set_default_source
+	gnome_calendar_set_selected_time_range
+	gnome_calendar_set_ui_component
+	gnome_calendar_set_view
+	gnome_calendar_setup_view_menus
+	gnome_calendar_view_popup_factory
 	goto_dialog
+	is_icalcomp_on_the_server
+	is_icalcomp_valid
+	itip_addresses_get
+	itip_addresses_get_default
+	itip_bonobo_control_new
+	itip_get_comp_attendee
+	itip_organizer_is_user
+	itip_organizer_is_user_ex
+	itip_publish_begin
+	itip_publish_comp
+	itip_send_comp
+	itip_sentby_is_user
+	itip_strip_mailto
+	ldata DATA
+	make_date_edit
+	make_exdate_date_edit
+	make_status_icons
+	make_timezone_entry
+	memo_editor_get_type
+	memo_editor_new
+	memo_page_construct
+	memo_page_create_date_edit
+	memo_page_create_source_combo_box
+	memo_page_get_type
+	memo_page_new
+	memo_page_set_info_string
+	memo_page_set_show_categories
+	memos_component_get_type
+	memos_component_peek
+	memos_component_peek_base_directory
+	memos_component_peek_config_directory
+	memos_component_peek_source_list
+	memos_control_activate
+	memos_control_deactivate
+	memos_control_new
+	memos_control_sensitize_commands
+	migrate_calendars
+	migrate_memos
+	migrate_tasks
+	orb DATA
+	print_calendar
+	print_comp
+	print_table
+	prompt_retract_dialog
+	recur_component_dialog
+	recurrence_page_construct
+	recurrence_page_get_type
+	recurrence_page_new
+	reply_to_calendar_comp
+	save_component_dialog
+	schedule_page_construct
+	schedule_page_get_type
+	schedule_page_new
+	schedule_page_set_meeting_time
+	schedule_page_set_name_selector
+	schedule_page_update_free_busy
+	select_source_dialog
+	send_component_dialog
+	send_component_prompt_subject
+	string_is_empty
+	tag_calendar_by_client
+	tag_calendar_by_comp
+	task_details_page_construct
+	task_details_page_create_date_edit
+	task_details_page_get_type
+	task_details_page_new
+	task_editor_get_type
+	task_editor_new
+	task_editor_show_assignment
+	task_page_add_attendee
+	task_page_construct
+	task_page_create_date_edit
+	task_page_create_source_combo_box
+	task_page_get_cancel_comp
+	task_page_get_type
+	task_page_hide_options
+	task_page_new
+	task_page_sendoptions_clicked_cb
+	task_page_set_assignment
+	task_page_set_info_string
+	task_page_set_show_categories
+	task_page_set_show_timezone
+	task_page_set_view_role
+	task_page_set_view_rsvp
+	task_page_set_view_status
+	task_page_set_view_type
+	task_page_show_options
+	tasks_component_get_type
+	tasks_component_peek
+	tasks_component_peek_base_directory
+	tasks_component_peek_config_directory
+	tasks_component_peek_source_list
+	tasks_control_activate
+	tasks_control_deactivate
+	tasks_control_new
+	tasks_control_sensitize_commands
+	weekday_picker_get_blocked_days
+	weekday_picker_get_days
+	weekday_picker_get_type
+	weekday_picker_get_week_start_day
+	weekday_picker_new
+	weekday_picker_set_blocked_days
+	weekday_picker_set_days
+	weekday_picker_set_week_start_day
+	
diff --git a/win32/libevolution-mail.def b/win32/libevolution-mail.def
index edcd38bdb3..9e630a836e 100644
--- a/win32/libevolution-mail.def
+++ b/win32/libevolution-mail.def
@@ -1,28 +1,683 @@
 EXPORTS
+	Bonobo_Plugin_info DATA
+	GNOME_Evolution_MailComponent__classid DATA
+	GNOME_Evolution_MailComponent__iinterface DATA
+	GNOME_Evolution_MailComponent__imethods DATA
+	GNOME_Evolution_MailComponent_test
+	POA_GNOME_Evolution_MailComponent__fini
+	POA_GNOME_Evolution_MailComponent__init
+	TC_GNOME_Evolution_MailComponent_struct
+	_ORBIT_skel_small_GNOME_Evolution_MailComponent_test
+	create_combo_text_widget
+	e_composer_actions_init
+	e_composer_autosave_find_orphans
+	e_composer_autosave_get_enabled
+	e_composer_autosave_get_fd
+	e_composer_autosave_get_filename
+	e_composer_autosave_get_saved
+	e_composer_autosave_register
+	e_composer_autosave_set_enabled
+	e_composer_autosave_set_saved
+	e_composer_autosave_snapshot
+	e_composer_autosave_unregister
+	e_composer_find_data_file
+	e_composer_from_header_get_account_list
+	e_composer_from_header_get_active
+	e_composer_from_header_get_active_name
+	e_composer_from_header_get_type
+	e_composer_from_header_new
+	e_composer_from_header_set_account_list
+	e_composer_from_header_set_active
+	e_composer_from_header_set_active_name
+	e_composer_get_default_charset
+	e_composer_header_get_label
+	e_composer_header_get_sensitive
+	e_composer_header_get_type
+	e_composer_header_get_visible
+	e_composer_header_set_input_tooltip
+	e_composer_header_set_sensitive
+	e_composer_header_set_title_tooltip
+	e_composer_header_set_visible
+	e_composer_header_table_add_destinations_bcc
+	e_composer_header_table_add_destinations_cc
+	e_composer_header_table_add_destinations_to
+	e_composer_header_table_get_account
+	e_composer_header_table_get_account_list
+	e_composer_header_table_get_account_name
+	e_composer_header_table_get_destinations
+	e_composer_header_table_get_destinations_bcc
+	e_composer_header_table_get_destinations_cc
+	e_composer_header_table_get_destinations_to
+	e_composer_header_table_get_header
+	e_composer_header_table_get_header_sensitive
+	e_composer_header_table_get_header_visible
+	e_composer_header_table_get_post_to
+	e_composer_header_table_get_reply_to
+	e_composer_header_table_get_signature
+	e_composer_header_table_get_signature_list
+	e_composer_header_table_get_subject
+	e_composer_header_table_get_type
+	e_composer_header_table_new
+	e_composer_header_table_set_account
+	e_composer_header_table_set_account_list
 	e_composer_header_table_set_account_name
 	e_composer_header_table_set_destinations_bcc
+	e_composer_header_table_set_destinations_cc
 	e_composer_header_table_set_destinations_to
+	e_composer_header_table_set_header_sensitive
+	e_composer_header_table_set_header_visible
+	e_composer_header_table_set_post_to_base
+	e_composer_header_table_set_post_to_list
+	e_composer_header_table_set_reply_to
+	e_composer_header_table_set_signature
+	e_composer_header_table_set_signature_list
 	e_composer_header_table_set_subject
-	e_composer_header_table_set_subject
+	e_composer_name_header_add_destinations
+	e_composer_name_header_get_destinations
+	e_composer_name_header_get_name_selector
+	e_composer_name_header_get_type
+	e_composer_name_header_new
+	e_composer_name_header_set_destinations
+	e_composer_post_header_get_account
+	e_composer_post_header_get_folders
+	e_composer_post_header_get_type
+	e_composer_post_header_new
+	e_composer_post_header_set_account
+	e_composer_post_header_set_folders
+	e_composer_post_header_set_folders_base
+	e_composer_private_dispose
+	e_composer_private_finalize
+	e_composer_private_init
+	e_composer_text_header_get_text
+	e_composer_text_header_get_type
+	e_composer_text_header_new_button
+	e_composer_text_header_new_label
+	e_composer_text_header_set_text
+	e_load_spell_languages
+	e_msg_composer_add_header
+	e_msg_composer_add_inline_image_from_file
+	e_msg_composer_add_inline_image_from_mime_part
+	e_msg_composer_add_message_attachments
 	e_msg_composer_attach
+	e_msg_composer_check_autosave
+	e_msg_composer_clear_inlined_table
+	e_msg_composer_get_attachment_bar
+	e_msg_composer_get_from
 	e_msg_composer_get_header_table
+	e_msg_composer_get_message
+	e_msg_composer_get_message_draft
+	e_msg_composer_get_message_print
+	e_msg_composer_get_raw_message_text
+	e_msg_composer_get_remote_download_count
+	e_msg_composer_get_reply_to
+	e_msg_composer_get_sig_file_content
+	e_msg_composer_get_type
+	e_msg_composer_is_exiting
+	e_msg_composer_load_from_file
+	e_msg_composer_modify_header
 	e_msg_composer_new
+	e_msg_composer_new_from_url
+	e_msg_composer_new_redirect
+	e_msg_composer_new_with_message
+	e_msg_composer_new_with_type
+	e_msg_composer_remove_header
+	e_msg_composer_reply_indent
+	e_msg_composer_request_close_all
+	e_msg_composer_save_draft
 	e_msg_composer_send
+	e_msg_composer_set_alternative
 	e_msg_composer_set_body
 	e_msg_composer_set_body_text
+	e_msg_composer_set_enable_autosave
+	e_msg_composer_set_send_options
+	e_msg_composer_show_sig_file
+	e_save_spell_languages
+	e_searching_tokenizer_add_primary_search_string
+	e_searching_tokenizer_add_secondary_search_string
+	e_searching_tokenizer_get_type
+	e_searching_tokenizer_match_count
+	e_searching_tokenizer_new
+	e_searching_tokenizer_set_primary_case_sensitivity
+	e_searching_tokenizer_set_primary_search_string
+	e_searching_tokenizer_set_secondary_case_sensitivity
+	e_searching_tokenizer_set_secondary_search_string
+	e_signature_editor_get_signature
+	e_signature_editor_get_type
+	e_signature_editor_new
+	e_signature_editor_set_signature
+	efhd_mnemonic_show_bar
+	em_account_editor_dropdown_new
+	em_account_editor_folder_selector_button_new
+	em_account_editor_get_type
+	em_account_editor_new
+	em_account_editor_ssl_selector_new
+	em_account_prefs_get_type
+	em_account_prefs_new
+	em_account_prefs_treeview_new
+	em_composer_prefs_get_type
+	em_composer_prefs_new
+	em_composer_prefs_new_signature
 	em_composer_utils_setup_callbacks
+	em_config_get_type
+	em_config_hook_get_type
+	em_config_new
+	em_config_target_new_account
+	em_config_target_new_folder
+	em_config_target_new_prefs
+	em_event_get_type
+	em_event_hook_get_type
+	em_event_peek
+	em_event_target_new_composer
+	em_event_target_new_custom_icon
+	em_event_target_new_folder
+	em_event_target_new_folder_browser
+	em_event_target_new_message
+	em_event_target_new_send_receive
+	em_filename_make_safe
+	em_filter_context_add_action
+	em_filter_context_create_action
+	em_filter_context_find_action
+	em_filter_context_get_type
+	em_filter_context_new
+	em_filter_context_next_action
+	em_filter_editor_construct
+	em_filter_editor_get_type
+	em_filter_editor_new
+	em_filter_folder_element_get_type
+	em_filter_folder_element_new
+	em_filter_folder_element_set_value
+	em_filter_rule_add_action
+	em_filter_rule_build_action
+	em_filter_rule_get_type
+	em_filter_rule_new
+	em_filter_rule_remove_action
+	em_filter_rule_replace_action
+	em_filter_source_element_get_type
+	em_filter_source_element_new
+	em_folder_browser_get_type
+	em_folder_browser_get_wide
+	em_folder_browser_new
+	em_folder_browser_show_preview
+	em_folder_browser_show_wide
+	em_folder_browser_suppress_message_selection
+	em_folder_properties_show
+	em_folder_selection_button_get_multiselect
 	em_folder_selection_button_get_selection
+	em_folder_selection_button_get_selection_mult
+	em_folder_selection_button_get_type
 	em_folder_selection_button_new
+	em_folder_selection_button_set_multiselect
 	em_folder_selection_button_set_selection
+	em_folder_selection_button_set_selection_mult
+	em_folder_selector_construct
+	em_folder_selector_create_new
+	em_folder_selector_get_selected_path
+	em_folder_selector_get_selected_paths
+	em_folder_selector_get_selected_uri
+	em_folder_selector_get_selected_uris
+	em_folder_selector_get_type
+	em_folder_selector_new
+	em_folder_selector_set_selected
+	em_folder_selector_set_selected_list
+	em_folder_tree_enable_drag_and_drop
+	em_folder_tree_get_model
+	em_folder_tree_get_model_storeinfo
+	em_folder_tree_get_selected_folder
+	em_folder_tree_get_selected_folder_info
+	em_folder_tree_get_selected_path
+	em_folder_tree_get_selected_paths
+	em_folder_tree_get_selected_uri
+	em_folder_tree_get_selected_uris
+	em_folder_tree_get_type
+	em_folder_tree_model_add_store
+	em_folder_tree_model_expand_foreach
+	em_folder_tree_model_get_expanded
+	em_folder_tree_model_get_expanded_uri
+	em_folder_tree_model_get_folder_name
+	em_folder_tree_model_get_selected
+	em_folder_tree_model_get_type
+	em_folder_tree_model_is_type_inbox
+	em_folder_tree_model_new
+	em_folder_tree_model_remove_folders
+	em_folder_tree_model_remove_store
+	em_folder_tree_model_save_state
+	em_folder_tree_model_set_expanded
+	em_folder_tree_model_set_expanded_uri
+	em_folder_tree_model_set_folder_info
+	em_folder_tree_model_set_selected
+	em_folder_tree_model_set_unread_count
+	em_folder_tree_new
+	em_folder_tree_new_with_model
+	em_folder_tree_select_next_path
+	em_folder_tree_select_prev_path
+	em_folder_tree_set_excluded
+	em_folder_tree_set_excluded_func
+	em_folder_tree_set_multiselect
+	em_folder_tree_set_selected
+	em_folder_tree_set_selected_list
+	em_folder_utils_copy_folder
+	em_folder_utils_copy_folders
+	em_folder_utils_create_folder
+	em_folder_utils_delete_folder
+	em_folder_utils_rename_folder
+	em_folder_view_get_popup_target
+	em_folder_view_get_type
+	em_folder_view_mark_selected
+	em_folder_view_new
+	em_folder_view_open_selected
+	em_folder_view_print
+	em_folder_view_set_hide_deleted
+	em_folder_view_set_statusbar
+	em_folder_view_setup_view_instance
+	em_format_add_header
+	em_format_add_puri
+	em_format_class_add_handler
+	em_format_class_remove_handler
+	em_format_clear_headers
+	em_format_clear_puri_tree
+	em_format_default_headers
+	em_format_describe_part
+	em_format_fallback_handler
+	em_format_find_puri
+	em_format_find_visible_puri
+	em_format_format_content
+	em_format_format_error
+	em_format_format_secure
+	em_format_format_text
+	em_format_get_type
+	em_format_hook_get_type
+	em_format_hook_register_type
+	em_format_html_add_pobject
+	em_format_html_clear_pobject
+	em_format_html_display_copy
+	em_format_html_display_cut
+	em_format_html_display_get_bar
+	em_format_html_display_get_type
+	em_format_html_display_goto_anchor
+	em_format_html_display_new
+	em_format_html_display_paste
+	em_format_html_display_popup_menu
+	em_format_html_display_search
+	em_format_html_display_search_close
+	em_format_html_display_search_with
+	em_format_html_display_set_animate
+	em_format_html_display_set_caret_mode
+	em_format_html_display_set_search
+	em_format_html_display_zoom_in
+	em_format_html_display_zoom_out
+	em_format_html_display_zoom_reset
+	em_format_html_file_part
+	em_format_html_find_pobject
+	em_format_html_find_pobject_func
+	em_format_html_get_search_dialog
+	em_format_html_get_type
+	em_format_html_job_new
+	em_format_html_job_queue
+	em_format_html_load_http
+	em_format_html_new
+	em_format_html_print_get_type
+	em_format_html_print_message
+	em_format_html_print_new
+	em_format_html_print_raw_message
+	em_format_html_remove_pobject
+	em_format_html_set_load_http
+	em_format_html_set_mark_citations
+	em_format_is_attachment
+	em_format_is_inline
+	em_format_merge_handler
+	em_format_part
+	em_format_part_as
+	em_format_pull_level
+	em_format_push_level
+	em_format_quote_get_type
+	em_format_quote_new
+	em_format_set_charset
+	em_format_set_default_charset
+	em_format_set_inline
+	em_format_set_mode
+	em_format_set_session
+	em_html_stream_get_type
+	em_html_stream_new
+	em_html_stream_set_flags
+	em_icon_stream_clear_cache
+	em_icon_stream_get_image
+	em_icon_stream_get_type
+	em_icon_stream_is_resized
+	em_icon_stream_new
+	em_inline_filter_get_multipart
+	em_inline_filter_get_type
+	em_inline_filter_new
+	em_junk_error_quark
+	em_junk_hook_get_type
+	em_junk_hook_register_type
+	em_mailer_prefs_get_type
+	em_mailer_prefs_header_free
+	em_mailer_prefs_header_from_xml
+	em_mailer_prefs_header_to_xml
+	em_mailer_prefs_new
+	em_marshal_BOOLEAN__BOXED_POINTER_POINTER
+	em_marshal_BOOLEAN__POINTER
+	em_marshal_VOID__POINTER_POINTER
+	em_marshal_VOID__STRING_STRING
+	em_marshal_VOID__STRING_STRING_UINT
+	em_menu_get_type
+	em_menu_hook_get_type
+	em_menu_new
+	em_menu_target_new_select
+	em_menu_target_new_widget
+	em_message_browser_get_type
+	em_message_browser_new
+	em_message_browser_window_new
+	em_migrate
+	em_network_prefs_get_type
+	em_network_prefs_new
+	em_popup_get_type
+	em_popup_hook_get_type
 	em_popup_new
 	em_popup_target_new_attachments
+	em_popup_target_new_folder
+	em_popup_target_new_part
+	em_popup_target_new_select
+	em_popup_target_new_uri
+	em_search_context_get_type
+	em_search_context_new
+	em_select_folder
+	em_stripsig_filter_get_type
+	em_stripsig_filter_new
+	em_subscribe_editor_new
+	em_sync_stream_get_type
+	em_sync_stream_set_buffer_size
+	em_uri_from_camel
+	em_uri_to_camel
+	em_utils_add_address
+	em_utils_add_vcard
+	em_utils_adjustment_page
+	em_utils_check_user_can_send_mail
+	em_utils_clear_get_password_canceled_accounts_flag
+	em_utils_compose_new_message
+	em_utils_compose_new_message_with_mailto
+	em_utils_composer_save_draft_cb
+	em_utils_composer_send_cb
+	em_utils_configure_account
+	em_utils_contact_photo
+	em_utils_edit_filters
+	em_utils_edit_message
+	em_utils_edit_messages
+	em_utils_empty_trash
+	em_utils_expunge_folder
+	em_utils_flag_for_followup
+	em_utils_flag_for_followup_clear
+	em_utils_flag_for_followup_completed
+	em_utils_folder_is_drafts
+	em_utils_folder_is_outbox
+	em_utils_folder_is_sent
+	em_utils_folder_is_templates
+	em_utils_folder_name_from_uri
+	em_utils_forward_attached
+	em_utils_forward_inline
+	em_utils_forward_message
+	em_utils_forward_message_raw
+	em_utils_forward_messages
+	em_utils_forward_quoted
+	em_utils_get_proxy_uri
+	em_utils_handle_receipt
+	em_utils_in_addressbook
+	em_utils_message_to_html
+	em_utils_part_to_html
+	em_utils_post_reply_to_message_by_uid
+	em_utils_post_to_folder
+	em_utils_post_to_url
 	em_utils_prompt_user
+	em_utils_redirect_message
+	em_utils_redirect_message_by_uid
+	em_utils_reply_to_message
+	em_utils_save_messages
+	em_utils_save_part
+	em_utils_save_part_to_file
+	em_utils_save_parts
+	em_utils_selection_get_mailbox
+	em_utils_selection_get_message
+	em_utils_selection_get_uidlist
+	em_utils_selection_get_urilist
+	em_utils_selection_set_mailbox
+	em_utils_selection_set_uidlist
+	em_utils_selection_set_urilist
+	em_utils_send_receipt
+	em_utils_show_error_silent
+	em_utils_show_info_silent
+	em_utils_snoop_type
+	em_utils_temp_save_part
+	em_utils_uids_copy
+	em_utils_uids_free
+	em_vfolder_context_get_type
+	em_vfolder_context_new
+	em_vfolder_editor_get_type
+	em_vfolder_editor_new
+	em_vfolder_editor_sourcelist_new
+	em_vfolder_rule_add_source
+	em_vfolder_rule_find_source
+	em_vfolder_rule_from_address
+	em_vfolder_rule_from_message
+	em_vfolder_rule_get_type
+	em_vfolder_rule_new
+	em_vfolder_rule_next_source
+	em_vfolder_rule_remove_source
+	emj_get_type
+	filter_gui_add_from_message
+	filter_rule_from_message
+	ldata DATA
+	mail_append_mail
+	mail_async_event DATA
+	mail_async_event_destroy
+	mail_async_event_emit
+	mail_async_event_new
+	mail_autoreceive_init
+	mail_build_attachment
+	mail_call_main
+	mail_cancel_all
+	mail_cancel_hook_add
+	mail_cancel_hook_remove
+	mail_check_service
+	mail_component_add_store
 	mail_component_get_folder
 	mail_component_get_folder_uri
+	mail_component_get_store_count
+	mail_component_get_type
+	mail_component_load_store_by_uri
+	mail_component_peek
+	mail_component_peek_activity_handler
 	mail_component_peek_base_directory
+	mail_component_peek_local_store
+	mail_component_peek_search_context
+	mail_component_peek_session
+	mail_component_peek_tree_model
+	mail_component_remove_folder
+	mail_component_remove_store
+	mail_component_remove_store_by_uri
+	mail_component_show_logger
+	mail_component_stores_foreach
+	mail_config_add_account
+	mail_config_add_signature
+	mail_config_clear
+	mail_config_control_factory_cb
+	mail_config_find_account
+	mail_config_folder_to_cachename
+	mail_config_folder_to_safe_url
+	mail_config_get_account_by_name
+	mail_config_get_account_by_source_url
+	mail_config_get_account_by_transport_url
+	mail_config_get_account_by_uid
+	mail_config_get_accounts
+	mail_config_get_address_count
+	mail_config_get_allowable_mime_types
+	mail_config_get_default_account
+	mail_config_get_default_identity
+	mail_config_get_default_transport
+	mail_config_get_enable_magic_spacebar
+	mail_config_get_error_level
+	mail_config_get_error_timeout
+	mail_config_get_gconf_client
+	mail_config_get_labels
+	mail_config_get_lookup_book
+	mail_config_get_lookup_book_local_only
+	mail_config_get_message_limit
+	mail_config_get_signature_by_name
+	mail_config_get_signature_by_uid
+	mail_config_get_signatures
+	mail_config_get_sync_timeout
+	mail_config_has_proxies
+	mail_config_init
+	mail_config_is_configured
+	mail_config_is_corrupt
+	mail_config_prune_proxies
+	mail_config_reload_junk_headers
+	mail_config_remove_account
+	mail_config_remove_account_proxies
+	mail_config_remove_signature
+	mail_config_save_accounts
+	mail_config_save_signatures
+	mail_config_scripts_disabled
+	mail_config_service_set_save_passwd
+	mail_config_set_default_account
+	mail_config_signature_new
+	mail_config_signature_run_script
+	mail_config_uri_deleted
+	mail_config_uri_renamed
+	mail_config_write
+	mail_config_write_on_exit
+	mail_crypto_get_pgp_cipher_context
+	mail_disable_stop
+	mail_empty_trash
+	mail_enable_stop
+	mail_execute_shell_command
+	mail_expunge_folder
+	mail_fetch_mail
+	mail_filter_delete_uri
+	mail_filter_folder
+	mail_filter_junk
+	mail_filter_on_demand
+	mail_filter_rename_uri
+	mail_folder_cache_get_folder_info_flags
+	mail_get_folder
+	mail_get_folder_quota
+	mail_get_folderinfo
+	mail_get_message
+	mail_get_messages
+	mail_get_messagex
+	mail_get_store
+	mail_in_main_thread
+	mail_indicate_new_mail
+	mail_msg_active
+	mail_msg_cancel
+	mail_msg_check_error
+	mail_msg_cleanup
 	mail_msg_fast_ordered_push
-	mail_msg_free
+	mail_msg_init
+	mail_msg_main_loop_push
 	mail_msg_new
+	mail_msg_ref
+	mail_msg_set_cancelable
+	mail_msg_slow_ordered_push
+	mail_msg_unordered_push
 	mail_msg_unref
+	mail_msg_wait
+	mail_msg_wait_all
+	mail_note_folder
+	mail_note_get_folder_from_uri
+	mail_note_store
+	mail_note_store_remove
+	mail_prep_offline
+	mail_receive_uri
+	mail_refresh_folder
+	mail_remove_folder
+	mail_save_messages
+	mail_save_part
+	mail_send
+	mail_send_queue
+	mail_send_receive
+	mail_session_add_junk_plugin
+	mail_session_add_password
+	mail_session_flush_filter_log
+	mail_session_forget_password
+	mail_session_forget_passwords
+	mail_session_get_interactive
+	mail_session_get_junk_plugins
+	mail_session_get_password
+	mail_session_init
+	mail_session_remember_password
+	mail_session_set_interactive
+	mail_session_set_junk_headers
+	mail_session_shutdown
+	mail_store_prepare_offline
+	mail_store_set_offline
+	mail_sync_folder
+	mail_sync_store
+	mail_tool_do_movemail
+	mail_tool_generate_forward_subject
+	mail_tool_get_inbox
+	mail_tool_get_trash
+	mail_tool_make_message_attachment
+	mail_tool_remove_xevolution_headers
+	mail_tool_restore_xevolution_headers
 	mail_tool_uri_to_folder
-	mail_win32_get_mail_thread_queued
+	mail_tools_folder_to_url
+	mail_tools_x_evolution_message_parse
+	mail_transfer_messages
+	mail_vfolder_add_uri
+	mail_vfolder_delete_uri
+	mail_vfolder_get_sources_local
+	mail_vfolder_get_sources_remote
+	mail_vfolder_rename_uri
+	mail_vfolder_shutdown
+	message_list_can_select
+	message_list_copy
+	message_list_ensure_message
+	message_list_free_uids
+	message_list_freeze
+	message_list_get_scrollbar_position
+	message_list_get_selected
+	message_list_get_type
+	message_list_get_uids
+	message_list_hidden
+	message_list_hide_add
+	message_list_hide_clear
+	message_list_hide_uids
+	message_list_invert_selection
+	message_list_length
+	message_list_new
+	message_list_paste
+	message_list_save_state
+	message_list_select
+	message_list_select_all
+	message_list_select_next_thread
+	message_list_select_subthread
+	message_list_select_thread
+	message_list_select_uid
+	message_list_set_folder
+	message_list_set_hidedeleted
+	message_list_set_scrollbar_position
+	message_list_set_search
+	message_list_set_selected
+	message_list_set_threaded
+	message_list_set_threaded_collapse_all
+	message_list_set_threaded_expand_all
+	message_list_thaw
+	message_tag_editor_get_tag_list
+	message_tag_editor_get_type
+	message_tag_editor_set_tag_list
+	message_tag_followup_append_message
+	message_tag_followup_get_type
+	message_tag_followup_new
+	session DATA
+	status_check
+	target_date_new
+	vfolder_clone_rule
+	vfolder_create_part
+	vfolder_edit
+	vfolder_edit_rule
+	vfolder_gui_add_from_address
+	vfolder_gui_add_from_message
+	vfolder_gui_add_rule
+	vfolder_load_storage
+	vfolder_revert
+	vfolder_store DATA
diff --git a/win32/libfilter.def b/win32/libfilter.def
index 3c84225131..e942c946dd 100644
--- a/win32/libfilter.def
+++ b/win32/libfilter.def
@@ -1,15 +1,102 @@
 EXPORTS
+	filter_code_get_type
+	filter_code_new
+	filter_colour_get_type
+	filter_colour_new
+	filter_datespec_get_type
+	filter_datespec_new
+	filter_element_build_code
+	filter_element_clone
+	filter_element_copy_value
+	filter_element_eq
+	filter_element_format_sexp
+	filter_element_get_type
+	filter_element_get_widget
+	filter_element_new
+	filter_element_set_data
+	filter_element_validate
+	filter_element_xml_create
+	filter_element_xml_decode
+	filter_element_xml_encode
+	filter_file_get_type
+	filter_file_new
+	filter_file_new_type_name
+	filter_file_set_path
+	filter_input_get_type
+	filter_input_new
+	filter_input_new_type_name
+	filter_input_set_value
+	filter_int_get_type
+	filter_int_new
+	filter_int_new_type
+	filter_int_set_value
+	filter_option_add
+	filter_option_get_current
+	filter_option_get_type
+	filter_option_new
+	filter_option_remove_all
+	filter_option_set_current
+	filter_part_build_code
+	filter_part_build_code_list
+	filter_part_clone
+	filter_part_copy_values
+	filter_part_eq
+	filter_part_expand_code
+	filter_part_find_element
+	filter_part_find_list
+	filter_part_get_type
+	filter_part_get_widget
+	filter_part_new
+	filter_part_next_list
+	filter_part_validate
+	filter_part_xml_create
+	filter_part_xml_decode
+	filter_part_xml_encode
+	filter_rule_add_part
 	filter_rule_build_code
 	filter_rule_clone
+	filter_rule_copy
+	filter_rule_emit_changed
+	filter_rule_eq
+	filter_rule_find_list
+	filter_rule_get_type
 	filter_rule_get_widget
 	filter_rule_new
+	filter_rule_next_list
+	filter_rule_remove_part
+	filter_rule_replace_part
 	filter_rule_set_name
 	filter_rule_set_source
 	filter_rule_validate
 	filter_rule_xml_decode
 	filter_rule_xml_encode
+	rule_context_add_part
+	rule_context_add_part_set
 	rule_context_add_rule
+	rule_context_add_rule_gui
+	rule_context_add_rule_set
+	rule_context_create_part
+	rule_context_delete_uri
+	rule_context_find_part
+	rule_context_find_rank_rule
 	rule_context_find_rule
+	rule_context_free_uri_list
+	rule_context_get_rank_rule
+	rule_context_get_type
+	rule_context_load
+	rule_context_new
+	rule_context_new_element
+	rule_context_next_part
 	rule_context_next_rule
+	rule_context_rank_rule
+	rule_context_remove_rule
+	rule_context_rename_uri
+	rule_context_revert
 	rule_context_save
+	rule_editor_construct
+	rule_editor_create_rule
+	rule_editor_get_type
 	rule_editor_new
+	rule_editor_set_sensitive
+	rule_editor_set_source
+	rule_editor_treeview_new