16068d9b41
2008-04-02 Matthew Barnes <mbarnes@redhat.com> ** Merge the mbarnes-composer branch * configure.in: Bump libgtkhtml requirement to 3.19.1. Add gtkhtml-editor dependency for addressbook, calendar and mail. Remove print-message plugin; new composer implements this natively. * tools/Makefile.am: Remove CORBA rules for the old composer. * addressbook/gui/widgets/Makefile.am: Remove CORBA rules for the old composer. * addressbook/gui/widgets/eab-gui-util.c (eab_send_to_contact_and_email_num_list), (eab_send_contact_list_as_attachment): Adapt to new Bonobo-less composer widget. * calendar/gui/Makefile.am: Remove CORBA rules for the old composer. * calendar/gui/itip-utils.c (comp_from), (comp_to_list), (comp_subject), (comp_content_type), (comp_filename), (comp_description), (append_cal_attachments), (itip_send_comp), (reply_to_calendar_comp): Adapt to new Bonobo-less composer widget. * composer/Makefile.am: Remove CORBA rules for the old composer. * composer/e-msg-composer.c: * composer/e-msg-composer.h: EMsgComposer is now a subclass of GtkhtmlEditor. Extensive refactoring and cleanup, too much to list in detail. * composer/e-composer-header.c: * composer/e-composer-header.h: Add "sensitive" property along with get/set functions. * composer/e-composer-from-header.c: * composer/e-composer-from-header.h: Propagate "refreshed" signal from EAccountComboBox. Add function e_composer_from_header_get_account_list(). * composer/e-composer-private.c: * composer/e-composer-private.h: New files manage composer's private data. Allows other composer files to manipulate private data. * composer/e-msg-composer-hdrs.c: * composer/e-msg-composer-hdrs.h: Remove these files; replaced by EComposerHeaderTable widget. * composer/evolution-composer.c: * composer/evolution-composer.h: Remove these files; composer is now a subclass of GtkhtmlEditor. * composer/e-msg-composer-select-file.c: * composer/e-msg-composer-select-file.h: Remove these files; logic moved to e-msg-composer.c. * composer/listener.c: * composer/listener.h: Remove these files; event handlers moved to e-msg-composer.c. * composer/Composer.idl: * composer/Evolution-Composer.idl: Remove these files; composer is no longer a Bonobo object. * mail/em-composer-prefs (sig_edit_cb), (em_composer_prefs_new_signature): Adapt to new Bonobo-less signature editor. * mail/mail-signature-editor.c: * mail/mail-signature-editor.h: Rewrite the signature editor as a subclass of GtkhtmlEditor. Eliminates Bonobo from the equation. * mail/em-composer-utils.c (composer_get_message), (em_utils_composer_send_cb), (save_draft_done), (em_utils_composer_save_draft_cb), (create_new_composer), (em_utils_compose_new_message), (em_utils_compose_new_message_with_mailto), (em_utils_post_to_folder), (em_utils_post_to_url), (edit_message), (forward_attached), (forward_non_attached), (reply_get_composer), (composer_set_body), (em_utils_reply_to_message), (post_reply_to_message): Adapt to new Bonobo-less composer. * mail/mail-component-factory.c: Composer is no longer needs a Bonobo factory. * mail/mail-config.c: Fix style pattern for EMsgComposer widgets. * plugins/groupwise/mail-send-options.c (org_gnome_composer_send_options): Adapt to streamlined EMsgComposer API. * plugins/exchange-operations/Makefile.am: Add EVOLUTION_MAIL_CFLAGS and EVOLUTION_MAIL_LIBS. * plugins/exchange-operations/exchange-mail-send-options.c (append_to_header), (org_gnome_exchange_send_options): Adapt to streamlined EMsgComposer API. * plugins/mailing-list-actions/mailing-list-actions.c (emla_list_action_do): Adapt to streamlined EMsgComposer API. * po/POTFILES.in: Update file list for new composer. * ui/evolution-composer-entries.xml: Remove this file; obsoleted by new composer. * widgets/misc/Makefile.am: Add EVOLUTION_MAIL_LIBS. * widgets/misc/e-account-combo-box.c: * widgets/misc/e-account-combo-box.h: New function e_account_combo_box_get_account_list(). Emit a "refreshed" signal when the EAccountList changes. Add an internal reverse-lookup index. * widgets/misc/e-charset-picker.c (e_charser_add_radio_actions): New function adds radio actions to an action group. Will eventually replace e_charset_picker_bonobo_ui_populate(). * widgets/misc/e-signature-combo-box.c: * widgets/misc/e-signature-combo-box.h: New function e_signature_combo_box_get_signature_list(). ... separate issue ... * configure.in: Bump eds_minimum_version to 2.23.1 for CAMEL_FOLDER_JUNKED_NOT_DELETED symbol. svn path=/trunk/; revision=35313
222 lines
4.6 KiB
Makefile
222 lines
4.6 KiB
Makefile
if OS_WIN32
|
|
WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la
|
|
endif
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/a11y/widgets \
|
|
-I$(top_srcdir)/widgets \
|
|
-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
|
|
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
|
|
-DG_LOG_DOMAIN=__FILE__ \
|
|
$(EVOLUTION_MAIL_CFLAGS) \
|
|
$(GNOME_PLATFORM_CFLAGS) \
|
|
$(ICONV_CFLAGS)
|
|
|
|
|
|
privsolib_LTLIBRARIES = \
|
|
libemiscwidgets.la \
|
|
libefilterbar.la
|
|
|
|
widgetsincludedir = $(privincludedir)/misc
|
|
|
|
if ENABLE_PILOT_CONDUITS
|
|
pilot_sources = e-pilot-settings.c
|
|
pilot_headers = e-pilot-settings.h
|
|
else
|
|
pilot_sources =
|
|
pilot_headers =
|
|
endif
|
|
|
|
glade_DATA = e-send-options.glade \
|
|
gal-categories.glade \
|
|
e-attachment.glade
|
|
|
|
widgetsinclude_HEADERS = \
|
|
$(pilot_headers) \
|
|
e-account-combo-box.h \
|
|
e-activity-handler.h \
|
|
e-attachment.h \
|
|
e-attachment-bar.h \
|
|
e-spinner.c \
|
|
e-spinner.h \
|
|
e-calendar.h \
|
|
e-calendar-item.h \
|
|
e-cell-date-edit.h \
|
|
e-cell-percent.h \
|
|
e-cell-renderer-combo.h \
|
|
e-charset-picker.h \
|
|
e-combo-cell-editable.h \
|
|
e-config-page.h \
|
|
e-combo-button.h \
|
|
e-dateedit.h \
|
|
e-dropdown-button.h \
|
|
e-expander.h \
|
|
e-icon-entry.h \
|
|
e-image-chooser.h \
|
|
e-info-label.h \
|
|
e-map.h \
|
|
e-multi-config-dialog.h \
|
|
e-search-bar.h \
|
|
e-task-bar.h \
|
|
e-task-widget.h \
|
|
e-send-options.h \
|
|
e-url-entry.h \
|
|
e-canvas-background.h \
|
|
e-canvas-utils.h \
|
|
e-canvas-vbox.h \
|
|
e-canvas.h \
|
|
e-cursors.h \
|
|
e-gui-utils.h \
|
|
e-hsv-utils.h \
|
|
e-popup-menu.h \
|
|
e-printable.h \
|
|
e-reflow-model.h \
|
|
e-reflow.h \
|
|
e-selection-model-array.h \
|
|
e-selection-model-simple.h \
|
|
e-selection-model.h \
|
|
e-signature-combo-box.h \
|
|
e-unicode.h \
|
|
e-colors.h
|
|
|
|
libemiscwidgets_la_SOURCES = \
|
|
$(widgetsinclude_HEADERS) \
|
|
$(pilot_sources) \
|
|
e-account-combo-box.c \
|
|
e-activity-handler.c \
|
|
e-calendar.c \
|
|
e-attachment.c \
|
|
e-attachment-bar.c \
|
|
e-calendar-item.c \
|
|
e-cell-date-edit.c \
|
|
e-cell-percent.c \
|
|
e-cell-renderer-combo.c \
|
|
e-charset-picker.c \
|
|
e-combo-cell-editable.c \
|
|
e-config-page.c \
|
|
e-combo-button.c \
|
|
e-dateedit.c \
|
|
e-dropdown-button.c \
|
|
e-expander.c \
|
|
e-icon-entry.c \
|
|
e-image-chooser.c \
|
|
e-info-label.c \
|
|
e-map.c \
|
|
e-multi-config-dialog.c \
|
|
e-search-bar.c \
|
|
e-task-bar.c \
|
|
e-task-widget.c \
|
|
e-send-options.c \
|
|
e-url-entry.c \
|
|
e-canvas-background.c \
|
|
e-canvas-utils.c \
|
|
e-canvas-vbox.c \
|
|
e-canvas.c \
|
|
e-cursors.c \
|
|
e-gui-utils.c \
|
|
e-hsv-utils.c \
|
|
e-popup-menu.c \
|
|
e-printable.c \
|
|
e-reflow-model.c \
|
|
e-reflow.c \
|
|
e-selection-model-array.c \
|
|
e-selection-model-simple.c \
|
|
e-selection-model.c \
|
|
e-signature-combo-box.c \
|
|
e-unicode.c \
|
|
e-colors.c
|
|
|
|
|
|
libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
|
|
|
|
libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(top_builddir)/widgets/table/libetable.la \
|
|
$(top_builddir)/widgets/text/libetext.la \
|
|
$(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \
|
|
$(top_builddir)/a11y/libevolution-a11y.la \
|
|
$(EVOLUTION_MAIL_LIBS) \
|
|
$(GNOME_PLATFORM_LIBS) \
|
|
$(EVOLUTON_MAIL_LIBS) \
|
|
$(ICONV_LIBS)
|
|
|
|
libefilterbar_la_SOURCES = \
|
|
e-filter-bar.c \
|
|
e-filter-bar.h
|
|
|
|
libefilterbar_la_LDFLAGS = $(NO_UNDEFINED)
|
|
|
|
libefilterbar_la_LIBADD = \
|
|
$(WIN32_BOOTSTRAP_LIBS) \
|
|
libemiscwidgets.la \
|
|
$(E_WIDGETS_LIBS)
|
|
|
|
noinst_PROGRAMS = \
|
|
test-calendar \
|
|
test-dateedit \
|
|
test-dropdown-button \
|
|
test-multi-config-dialog \
|
|
test-info-label
|
|
|
|
# test-calendar
|
|
|
|
test_calendar_SOURCES = \
|
|
test-calendar.c
|
|
|
|
test_calendar_LDADD = \
|
|
libemiscwidgets.la \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(E_WIDGETS_LIBS)
|
|
|
|
# test-dateedit
|
|
|
|
test_dateedit_SOURCES = \
|
|
test-dateedit.c
|
|
|
|
test_dateedit_LDADD = \
|
|
libemiscwidgets.la \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(E_WIDGETS_LIBS)
|
|
|
|
# test-dropdown-button
|
|
|
|
test_dropdown_button_SOURCES = \
|
|
test-dropdown-button.c
|
|
|
|
test_dropdown_button_LDADD = \
|
|
libemiscwidgets.la \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(E_WIDGETS_LIBS)
|
|
|
|
# test-multi-config-dialog
|
|
|
|
test_multi_config_dialog_SOURCES = \
|
|
test-multi-config-dialog.c
|
|
|
|
test_multi_config_dialog_LDADD = \
|
|
libemiscwidgets.la \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(E_WIDGETS_LIBS)
|
|
|
|
# test-info-label
|
|
|
|
test_info_label_SOURCES = \
|
|
test-info-label.c
|
|
|
|
test_info_label_LDADD = \
|
|
libemiscwidgets.la \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(E_WIDGETS_LIBS)
|
|
|
|
|
|
EXTRA_DIST = \
|
|
$(glade_DATA) \
|
|
e-pilot-settings.h \
|
|
e-pilot-settings.c \
|
|
ChangeLog.pre-1-4
|
|
|
|
dist-hook:
|
|
-mkdir $(distdir)/pixmaps
|
|
cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
|