2008-04-05 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #526152, plus some tangential code cleanup. * mail/Makefile.am: Remove all the IDL crud for GnomeSpell. * mail/em-composer-prefs.c: * mail/evolution-mail.schemas.in: * mail/mail-config.c: Define our own GConf keys for active spell checking languages and the underline color for misspelled words, instead of relying on GnomeSpell's GConf keys. The new keys are: /apps/evolution/mail/composer/spell_color (string) /apps/evolution/mail/composer/spell_languages (list of strings) * mail/em-composer-prefs.c: * mail/em-composer-prefs.h: Cleanup the logic a bit to improve readability. * mail/mail-config.c: Cleanup the GConf notification logic: - We don't need the notification IDs for GConf keys we're watching. - Minimize the repetition of GConf keys to reduce the risk of typos. - Reduce the number of notification callback functions. * mail/Spell.idl: Remove this file; we don't use GnomeSpell anymore. * composer/e-msg-composer.c: * composer/e-composer-private.h: Initialize a new composer's spell checking language menu via our new "spell_languages" GConf key. * tools/killev.c (main): No need to continue killing the GnomeSpell Bonobo server. svn path=/trunk/; revision=35322
316 lines
8.0 KiB
Makefile
316 lines
8.0 KiB
Makefile
SUBDIRS = default importers
|
|
|
|
mailincludedir = $(privincludedir)/mail
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir)/widgets \
|
|
-I$(top_srcdir)/widgets/e-text \
|
|
-I$(top_srcdir)/widgets/misc \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/mail \
|
|
-I$(top_srcdir)/composer \
|
|
-I$(top_builddir)/composer \
|
|
-I$(top_builddir)/shell \
|
|
-I$(top_srcdir)/shell \
|
|
-I$(top_srcdir)/smime/lib \
|
|
-I$(top_srcdir)/smime/gui \
|
|
$(EVOLUTION_MAIL_CFLAGS) \
|
|
$(CERT_UI_CFLAGS) \
|
|
$(THREADS_CFLAGS) \
|
|
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
|
|
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
|
|
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
|
|
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
|
|
-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
|
|
-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
|
|
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
|
|
-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
|
|
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
|
|
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
|
|
-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
|
|
-DPREFIX=\""$(prefix)"\" \
|
|
-DG_LOG_DOMAIN=\"evolution-mail\"
|
|
|
|
component_LTLIBRARIES = libevolution-mail.la
|
|
|
|
# Mail.idl
|
|
MAIL_IDL = Evolution-Mail.idl
|
|
MAIL_IDL_GENERATED_H = \
|
|
Evolution-Mail.h
|
|
MAIL_IDL_GENERATED_C = \
|
|
Evolution-Mail-common.c \
|
|
Evolution-Mail-skels.c \
|
|
Evolution-Mail-stubs.c
|
|
MAIL_IDL_GENERATED = $(MAIL_IDL_GENERATED_C) $(MAIL_IDL_GENERATED_H)
|
|
|
|
$(MAIL_IDL_GENERATED_H): $(MAIL_IDL)
|
|
$(ORBIT_IDL) -I $(top_srcdir) -I $(datadir)/idl $(IDL_INCLUDES) $^
|
|
$(MAIL_IDL_GENERATED_C): $(MAIL_IDL_GENERATED_H)
|
|
|
|
# IDL install
|
|
|
|
idl_DATA = $(MAIL_IDL)
|
|
|
|
# plugin mail api
|
|
mailinclude_HEADERS = \
|
|
$(MAIL_IDL_GENERATED_H) \
|
|
em-composer-utils.h \
|
|
em-config.h \
|
|
em-event.h \
|
|
em-folder-browser.h \
|
|
em-folder-tree-model.h \
|
|
em-folder-tree.h \
|
|
em-folder-utils.h \
|
|
em-folder-view.h \
|
|
em-format-hook.h \
|
|
em-format-html-display.h \
|
|
em-format-html-print.h \
|
|
em-format-html.h \
|
|
em-format-quote.h \
|
|
em-format.h \
|
|
em-html-stream.h \
|
|
em-icon-stream.h \
|
|
em-inline-filter.h \
|
|
em-junk-hook.h \
|
|
em-menu.h \
|
|
em-message-browser.h \
|
|
em-popup.h \
|
|
em-stripsig-filter.h \
|
|
em-sync-stream.h \
|
|
em-utils.h \
|
|
em-vfs-stream.h \
|
|
mail-autofilter.h \
|
|
mail-component.h \
|
|
mail-config.h \
|
|
mail-mt.h \
|
|
mail-ops.h \
|
|
mail-session.h \
|
|
mail-tools.h \
|
|
message-list.h \
|
|
mail-vfolder.h
|
|
|
|
# libevolution-mail
|
|
|
|
libevolution_mail_la_SOURCES = \
|
|
$(MAIL_IDL_GENERATED) \
|
|
$(MARSHAL_GENERATED) \
|
|
$(mailinclude_HEADERS) \
|
|
e-searching-tokenizer.c \
|
|
e-searching-tokenizer.h \
|
|
em-account-editor.c \
|
|
em-account-editor.h \
|
|
em-account-prefs.c \
|
|
em-account-prefs.h \
|
|
em-composer-prefs.c \
|
|
em-composer-prefs.h \
|
|
em-composer-utils.c \
|
|
em-config.c \
|
|
em-event.c \
|
|
em-filter-context.c \
|
|
em-filter-context.h \
|
|
em-filter-editor.c \
|
|
em-filter-editor.h \
|
|
em-filter-folder-element.c \
|
|
em-filter-folder-element.h \
|
|
em-filter-rule.c \
|
|
em-filter-rule.h \
|
|
em-filter-source-element.c \
|
|
em-filter-source-element.h \
|
|
em-folder-browser.c \
|
|
em-folder-properties.c \
|
|
em-folder-properties.h \
|
|
em-folder-selection-button.c \
|
|
em-folder-selection-button.h \
|
|
em-folder-selection.c \
|
|
em-folder-selection.h \
|
|
em-folder-selector.c \
|
|
em-folder-selector.h \
|
|
em-folder-tree-model.c \
|
|
em-folder-tree.c \
|
|
em-folder-utils.c \
|
|
em-folder-view.c \
|
|
em-format-hook.c \
|
|
em-format-html-display.c \
|
|
em-format-html-print.c \
|
|
em-format-html.c \
|
|
em-format-quote.c \
|
|
em-format.c \
|
|
em-html-stream.c \
|
|
em-icon-stream.c \
|
|
em-inline-filter.c \
|
|
em-junk-hook.c \
|
|
em-mailer-prefs.c \
|
|
em-mailer-prefs.h \
|
|
em-menu.c \
|
|
em-message-browser.c \
|
|
em-migrate.c \
|
|
em-migrate.h \
|
|
em-network-prefs.c \
|
|
em-network-prefs.h \
|
|
em-popup.c \
|
|
em-search-context.c \
|
|
em-search-context.h \
|
|
em-stripsig-filter.c \
|
|
em-subscribe-editor.c \
|
|
em-subscribe-editor.h \
|
|
em-sync-stream.c \
|
|
em-utils.c \
|
|
em-vfolder-context.c \
|
|
em-vfolder-context.h \
|
|
em-vfolder-editor.c \
|
|
em-vfolder-editor.h \
|
|
em-vfolder-rule.c \
|
|
em-vfolder-rule.h \
|
|
em-vfs-stream.c \
|
|
mail-autofilter.c \
|
|
mail-component-factory.c \
|
|
mail-component.c \
|
|
mail-config-factory.c \
|
|
mail-config-factory.h \
|
|
mail-config.c \
|
|
mail-crypto.c \
|
|
mail-crypto.h \
|
|
mail-folder-cache.c \
|
|
mail-folder-cache.h \
|
|
mail-mt.c \
|
|
mail-ops.c \
|
|
mail-send-recv.c \
|
|
mail-send-recv.h \
|
|
mail-session.c \
|
|
mail-signature-editor.c \
|
|
mail-signature-editor.h \
|
|
mail-tools.c \
|
|
mail-types.h \
|
|
mail-vfolder.c \
|
|
message-list.c \
|
|
message-tag-editor.c \
|
|
message-tag-editor.h \
|
|
message-tag-followup.c \
|
|
message-tag-followup.h
|
|
|
|
if ENABLE_SMIME
|
|
SMIME_LIBS = \
|
|
$(top_builddir)/smime/lib/libessmime.la \
|
|
$(top_builddir)/smime/gui/libevolution-smime.la
|
|
endif
|
|
|
|
libevolution_mail_la_LIBADD = \
|
|
$(top_builddir)/e-util/libeutil.la \
|
|
$(top_builddir)/shell/libeshell.la \
|
|
$(top_builddir)/composer/libcomposer.la \
|
|
$(top_builddir)/widgets/table/libetable.la \
|
|
$(top_builddir)/widgets/text/libetext.la \
|
|
$(top_builddir)/widgets/misc/libemiscwidgets.la \
|
|
$(top_builddir)/widgets/misc/libefilterbar.la \
|
|
$(top_builddir)/filter/libfilter.la \
|
|
$(top_builddir)/widgets/menus/libmenus.la \
|
|
$(top_builddir)/addressbook/util/libeabutil.la \
|
|
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
|
|
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
|
|
$(top_builddir)/mail/importers/libevolution-mail-importers.la \
|
|
$(SMIME_LIBS) \
|
|
$(EVOLUTION_MAIL_LIBS) \
|
|
$(GTKHTML_LIBS) \
|
|
$(REGEX_LIBS) \
|
|
$(THREADS_LIBS)
|
|
|
|
libevolution_mail_la_LDFLAGS = \
|
|
-avoid-version -module $(NO_UNDEFINED)
|
|
|
|
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
|
|
|
|
# .server files
|
|
|
|
server_in_files = GNOME_Evolution_Mail.server.in.in
|
|
server_DATA = $(server_in_files:.server.in.in=.server)
|
|
|
|
@EVO_SERVER_RULE@
|
|
@INTLTOOL_SERVER_RULE@
|
|
|
|
# Misc data to install
|
|
filterdir = $(privdatadir)
|
|
filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml
|
|
|
|
error_DATA = mail.error
|
|
errordir = $(privdatadir)/errors
|
|
# provides error rules too
|
|
@EVO_PLUGIN_RULE@
|
|
|
|
em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml
|
|
echo "/* Automatically generated. Do not edit. */" > $@; \
|
|
cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml $(srcdir)/searchtypes.xml | \
|
|
sed -n -e 's:.*<title>\(.*\)</title>:char *s = N_("\1");:p' | \
|
|
sort -u >> $@
|
|
|
|
glade_DATA = mail-config.glade mail-dialogs.glade
|
|
MARSHAL_GENERATED = em-marshal.c em-marshal.h
|
|
@EVO_MARSHAL_RULE@
|
|
|
|
etspec_DATA = message-list.etspec
|
|
|
|
EXTRA_DIST = \
|
|
ChangeLog.pre-1-4 \
|
|
README.async \
|
|
em-marshal.list \
|
|
$(MAIL_IDL) \
|
|
mail.error.xml \
|
|
$(glade_DATA) \
|
|
$(schema_in_files) \
|
|
$(server_in_files) \
|
|
$(etspec_DATA) \
|
|
filtertypes.xml \
|
|
vfoldertypes.xml \
|
|
searchtypes.xml \
|
|
em-filter-i18n.h
|
|
|
|
# Purify support
|
|
|
|
if ENABLE_PURIFY
|
|
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|
|
|
all-local: evolution-mail.pure
|
|
|
|
evolution-mail.pure: evolution-mail
|
|
@rm -f evolution-mail.pure
|
|
$(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
|
|
|
|
endif
|
|
|
|
|
|
# GConf
|
|
|
|
schemadir = $(GCONF_SCHEMA_FILE_DIR)
|
|
schema_in_files = evolution-mail.schemas.in
|
|
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
|
|
@INTLTOOL_SCHEMAS_RULE@
|
|
|
|
if OS_WIN32
|
|
install-data-local:
|
|
if test -z "$(DESTDIR)" ; then \
|
|
for p in $(schema_DATA) ; do \
|
|
(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
|
|
echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
|
|
cmd /c _temp.bat; \
|
|
rm _temp.bat; \
|
|
done \
|
|
fi
|
|
else
|
|
install-data-local:
|
|
if test -z "$(DESTDIR)" ; then \
|
|
for p in $(schema_DATA) ; do \
|
|
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
|
|
done \
|
|
fi
|
|
endif
|
|
|
|
# Prologue
|
|
|
|
dist-hook:
|
|
cd $(distdir); rm -f $(BUILT_SOURCES)
|
|
|
|
BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA)
|
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
DISTCLEANFILES = $(schema_DATA)
|