diff options
| -rw-r--r-- | calendar/gui/cal-editor-utils.c | 10 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 9 | ||||
| -rw-r--r-- | calendar/gui/e-memo-table.c | 40 | ||||
| -rw-r--r-- | plugins/mail-to-task/Makefile.am | 1 | ||||
| -rw-r--r-- | win32/Makefile.am | 7 | ||||
| -rw-r--r-- | win32/libevolution-calendar.def | 525 | ||||
| -rw-r--r-- | win32/libevolution-mail-shared.def | 23 | ||||
| -rw-r--r-- | win32/libevolution-mail.def | 18 |
8 files changed, 97 insertions, 536 deletions
diff --git a/calendar/gui/cal-editor-utils.c b/calendar/gui/cal-editor-utils.c index 4258e2ce01..d4389aa928 100644 --- a/calendar/gui/cal-editor-utils.c +++ b/calendar/gui/cal-editor-utils.c @@ -30,6 +30,16 @@ #include "dialogs/task-editor.h" #include "dialogs/memo-editor.h" +<<<<<<< HEAD +======= +#ifdef G_OS_WIN32 +const ECompEditorRegistry * const comp_editor_get_registry(); +#define comp_editor_registry comp_editor_get_registry() +#else +extern ECompEditorRegistry *comp_editor_registry; +#endif + +>>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all /** * open_component_editor: * @client: Already opened #ECal, where to store the component diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index fd8650edad..e80d894a3b 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -75,9 +75,18 @@ struct _ECalendarViewPrivate { /* The default category */ gchar *default_category; +<<<<<<< HEAD GtkTargetList *copy_target_list; GtkTargetList *paste_target_list; }; +======= +#ifdef G_OS_WIN32 +const ECompEditorRegistry * const comp_editor_get_registry(); +#define comp_editor_registry comp_editor_get_registry() +#else +extern ECompEditorRegistry *comp_editor_registry; +#endif +>>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all enum { PROP_0, diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 459fff3e15..842a14897c 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -80,6 +80,46 @@ enum { PROP_SHELL_VIEW }; +<<<<<<< HEAD +======= +#ifdef G_OS_WIN32 +const ECompEditorRegistry * const comp_editor_get_registry(); +#define comp_editor_registry comp_editor_get_registry() +#else +extern ECompEditorRegistry *comp_editor_registry; +#endif + +static void e_memo_table_destroy (GtkObject *object); + +static void e_memo_table_on_double_click (ETable *table, + gint row, + gint col, + GdkEvent *event, + EMemoTable *memo_table); +static gint e_memo_table_show_popup_menu (ETable *table, + GdkEvent *gdk_event, + EMemoTable *memo_table); + +static gint e_memo_table_on_right_click (ETable *table, + gint row, + gint col, + GdkEvent *event, + EMemoTable *memo_table); +static gboolean e_memo_table_on_popup_menu (GtkWidget *widget, + gpointer data); + +static gint e_memo_table_on_key_press (ETable *table, + gint row, + gint col, + GdkEventKey *event, + EMemoTable *memo_table); +static struct tm e_memo_table_get_current_time (ECellDateEdit *ecde, gpointer data); + +static ECalModelComponent *get_selected_comp (EMemoTable *memo_table); +static void open_memo (EMemoTable *memo_table, ECalModelComponent *comp_data); + +/* Signal IDs */ +>>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all enum { OPEN_COMPONENT, POPUP_EVENT, diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 481390ced0..d6df87dd79 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -22,6 +22,7 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(top_builddir)/calendar/gui/libevolution-cal-shared.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_LIBS) \ diff --git a/win32/Makefile.am b/win32/Makefile.am index 7720d56543..ba405e0f9e 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = \ libetext.def \ libevolution-addressbook.def \ libevolution-calendar.def \ + libevolution-cal-shared.def \ libevolution-mail.def \ libfilter.def @@ -15,6 +16,7 @@ BOOTSTRAP_LIBS = \ libetext.la \ libevolution-addressbook.la \ libevolution-calendar.la \ + libevolution-cal-shared.la \ libevolution-mail.la \ libfilter.la endif @@ -51,6 +53,11 @@ libevolution-calendar.la: dummy.la libevolution-calendar.def mkdir -p .libs $(DLLTOOL) --output-lib=.libs/libevolution-calendar.dll.a --dllname=libevolution-calendar.dll --input-def=libevolution-calendar.def +libevolution-cal-shared.la: dummy.la libevolution-cal-shared.def + sed -e s!%DLL%!libevolution-cal-shared-0! -e s!%LIB%!libevolution-cal-shared! -e s!%PFX%!$(prefix)! <dummy.la >$@ + mkdir -p .libs + $(DLLTOOL) --output-lib=.libs/libevolution-cal-shared.dll.a --dllname=libevolution-cal-shared-0.dll --input-def=libevolution-cal-shared.def + libevolution-mail.la: dummy.la libevolution-mail.def sed -e s!%DLL%!libevolution-mail! -e s!%LIB%!libevolution-mail! -e s!%PFX%!$(prefix)! <dummy.la >$@ mkdir -p .libs diff --git a/win32/libevolution-calendar.def b/win32/libevolution-calendar.def index d7dda49b16..827b88b16b 100644 --- a/win32/libevolution-calendar.def +++ b/win32/libevolution-calendar.def @@ -1,7 +1,5 @@ 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 @@ -211,27 +209,7 @@ EXPORTS 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 @@ -240,139 +218,6 @@ EXPORTS 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_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_month_scroll_by_week - 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_use_system_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_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_scroll_by_week - 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_timezone_stored - calendar_config_get_use_default_reminder - calendar_config_get_use_system_timezone - 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_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_scroll_by_week - 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_use_system_timezone - 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 @@ -396,6 +241,7 @@ EXPORTS changed_component_dialog comp_editor_append_page comp_editor_close + comp_editor_copy_new_attendees comp_editor_date_label comp_editor_dates comp_editor_delete_comp @@ -414,6 +260,7 @@ EXPORTS comp_editor_get_existing_org comp_editor_get_flags comp_editor_get_group_item + comp_editor_get_lite comp_editor_get_managed_widget comp_editor_get_mime_attach_list comp_editor_get_needs_send @@ -421,6 +268,9 @@ EXPORTS comp_editor_get_type comp_editor_get_ui_manager comp_editor_get_user_org + comp_editor_have_in_new_attendees + comp_editor_have_in_new_attendees_lst + comp_editor_manage_new_attendees comp_editor_new_date_edit comp_editor_page_changed comp_editor_page_display_validation_error @@ -435,7 +285,7 @@ EXPORTS comp_editor_page_notify_dates_changed comp_editor_page_set_dates comp_editor_page_set_updating - comp_editor_registry DATA + comp_editor_get_registry comp_editor_remove_page comp_editor_save_comp comp_editor_select_file @@ -447,25 +297,16 @@ EXPORTS comp_editor_set_existing_org comp_editor_set_flags comp_editor_set_group_item + comp_editor_set_lite 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_attachment_handler_calendar_get_type e_cal_comp_preview_url_requested_cb e_cal_component_memo_preview_clear e_cal_component_memo_preview_display @@ -481,15 +322,6 @@ EXPORTS 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 @@ -504,56 +336,13 @@ EXPORTS 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_select - e_cal_popup_target_new_source e_calendar_table_complete_selected e_calendar_table_config_get_table e_calendar_table_config_get_type @@ -576,120 +365,10 @@ EXPORTS 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_open_event_with_flags - 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 @@ -711,110 +390,6 @@ EXPORTS 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 @@ -847,19 +422,6 @@ EXPORTS 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 @@ -881,51 +443,6 @@ EXPORTS 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 @@ -954,8 +471,6 @@ EXPORTS 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 @@ -1002,20 +517,7 @@ EXPORTS 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 @@ -1051,7 +553,6 @@ EXPORTS recurrence_page_construct recurrence_page_get_type recurrence_page_new - reply_to_calendar_comp save_component_dialog schedule_page_construct schedule_page_get_type @@ -1062,9 +563,6 @@ EXPORTS 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 @@ -1099,11 +597,4 @@ EXPORTS 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-shared.def b/win32/libevolution-mail-shared.def index a86804025b..b9ef78fd47 100644 --- a/win32/libevolution-mail-shared.def +++ b/win32/libevolution-mail-shared.def @@ -1,15 +1,16 @@ EXPORTS composer_lite DATA + e_attachment_handler_mail_get_type 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_snapshot_async + e_composer_autosave_snapshot_finish e_composer_autosave_unregister e_composer_find_data_file e_composer_from_header_get_account_list @@ -17,6 +18,7 @@ EXPORTS e_composer_from_header_get_active_name e_composer_from_header_get_type e_composer_from_header_new + e_composer_from_header_new_with_action e_composer_from_header_set_account_list e_composer_from_header_set_active e_composer_from_header_set_active_name @@ -85,6 +87,22 @@ EXPORTS e_composer_text_header_new_label e_composer_text_header_set_text e_load_spell_languages + e_mail_attachment_bar_get_active_view + e_mail_attachment_bar_get_expanded + e_mail_attachment_bar_get_type + e_mail_attachment_bar_new + e_mail_attachment_bar_set_active_view + e_mail_attachment_bar_set_expanded + e_mail_search_bar_changed + e_mail_search_bar_clear + e_mail_search_bar_get_case_sensitive + e_mail_search_bar_get_html + e_mail_search_bar_get_text + e_mail_search_bar_get_tokenizer + e_mail_search_bar_get_type + e_mail_search_bar_new + e_mail_search_bar_set_case_sensitive + e_mail_search_bar_set_text e_msg_composer_add_header e_msg_composer_add_inline_image_from_file e_msg_composer_add_inline_image_from_mime_part @@ -475,6 +493,7 @@ EXPORTS mail_send mail_send_queue mail_send_receive + mail_send_receive_dialog mail_servers DATA mail_session_add_junk_plugin mail_session_add_password diff --git a/win32/libevolution-mail.def b/win32/libevolution-mail.def index b0530a17fc..4c4ec1f84d 100644 --- a/win32/libevolution-mail.def +++ b/win32/libevolution-mail.def @@ -9,23 +9,6 @@ EXPORTS TC_GNOME_Evolution_MailComponent_struct DATA _ORBIT_skel_small_GNOME_Evolution_MailComponent_test create_combo_text_widget - e_attachment_handler_mail_get_type - e_mail_attachment_bar_get_active_view - e_mail_attachment_bar_get_expanded - e_mail_attachment_bar_get_type - e_mail_attachment_bar_new - e_mail_attachment_bar_set_active_view - e_mail_attachment_bar_set_expanded - e_mail_search_bar_changed - e_mail_search_bar_clear - e_mail_search_bar_get_case_sensitive - e_mail_search_bar_get_html - e_mail_search_bar_get_text - e_mail_search_bar_get_tokenizer - e_mail_search_bar_get_type - e_mail_search_bar_new - e_mail_search_bar_set_case_sensitive - e_mail_search_bar_set_text e_searching_tokenizer_add_primary_search_string e_searching_tokenizer_add_secondary_search_string e_searching_tokenizer_get_type @@ -172,3 +155,4 @@ EXPORTS message_list_thaw status_check vfolder_store DATA + x_mailer DATA |