[evolution/webkit-composer: 32/34] Merge branch 'master' into webkit-composer
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit-composer: 32/34] Merge branch 'master' into webkit-composer
- Date: Sat, 29 Dec 2012 00:00:49 +0000 (UTC)
commit 68c9b8831d8df721994b4a95ff127a831aa212bc
Merge: ca9cc73 db06fb8
Author: Dan VrÃtil <dvratil redhat com>
Date: Sun Dec 23 23:36:18 2012 +0100
Merge branch 'master' into webkit-composer
Conflicts:
doc/reference/libeshell/Makefile.am
doc/reference/libeutil/libeutil-docs.sgml
e-util/e-web-view-gtkhtml.h
MAINTAINERS | 16 +-
NEWS | 69 +
addressbook/gui/widgets/eab-config.c | 5 +-
addressbook/gui/widgets/eab-config.h | 2 +-
calendar/gui/dialogs/event-page.c | 6 +-
calendar/gui/dialogs/memo-page.c | 4 +-
calendar/gui/dialogs/task-page.c | 8 +-
calendar/gui/e-cal-config.c | 5 +-
calendar/gui/e-cal-config.h | 3 +-
calendar/gui/e-meeting-store.c | 4 +-
configure.ac | 2 +-
doc/reference/libeshell/Makefile.am | 65 +-
doc/reference/libeshell/libeshell-docs.sgml | 2 +-
doc/reference/libeshell/libeshell-sections.txt | 2 -
doc/reference/libeshell/libeshell.types | 10 +
doc/reference/libeutil/Makefile.am | 9 +-
doc/reference/libeutil/libeutil-docs.sgml | 126 +-
doc/reference/libeutil/libeutil-sections.txt | 2976 +++-
doc/reference/libeutil/libeutil.types | 1 +
e-util/Makefile.am | 5 +-
e-util/e-action-combo-box.c | 12 +-
e-util/e-action-combo-box.h | 6 +-
e-util/e-activity-bar.h | 2 +-
e-util/e-activity-proxy.h | 2 +-
e-util/e-activity.h | 2 +-
e-util/e-alert-bar.h | 2 +-
e-util/e-alert-dialog.h | 2 +-
e-util/e-alert-sink.h | 2 +-
e-util/e-alert.h | 2 +-
e-util/e-attachment-bar.h | 2 +-
e-util/e-attachment-button.h | 2 +-
e-util/e-attachment-dialog.h | 2 +-
e-util/e-attachment-handler-image.h | 2 +-
e-util/e-attachment-handler-sendto.h | 2 +-
e-util/e-attachment-handler.h | 2 +-
e-util/e-attachment-icon-view.h | 2 +-
e-util/e-attachment-paned.h | 2 +-
e-util/e-attachment-store.h | 2 +-
e-util/e-attachment-tree-view.h | 2 +-
e-util/e-attachment-view.c | 4 +-
e-util/e-attachment-view.h | 2 +-
e-util/e-attachment.h | 2 +-
e-util/e-bit-array.c | 2 +-
e-util/e-bit-array.h | 120 +-
e-util/e-calendar-item.h | 2 +-
e-util/e-calendar.h | 2 +-
e-util/e-canvas.h | 2 +-
e-util/e-categories-dialog.h | 2 +-
e-util/e-categories-editor.h | 2 +-
e-util/e-categories-selector.h | 2 +-
e-util/e-category-completion.h | 2 +-
e-util/e-category-editor.h | 2 +-
e-util/e-cell-renderer-color.h | 2 +-
e-util/e-cell.h | 2 -
e-util/e-charset-combo-box.h | 2 +-
e-util/e-config.c | 741 +-
e-util/e-config.h | 39 +-
e-util/e-contact-store.h | 8 +-
e-util/e-dateedit.h | 2 +-
e-util/e-datetime-format.h | 32 +-
e-util/e-destination-store.h | 2 +-
e-util/e-event.h | 4 +-
e-util/e-filter-code.h | 2 +-
e-util/e-filter-color.h | 2 +-
e-util/e-filter-datespec.h | 2 +-
e-util/e-filter-element.c | 2 +
e-util/e-filter-element.h | 4 +-
e-util/e-filter-file.h | 2 +-
e-util/e-filter-input.h | 2 +-
e-util/e-filter-int.h | 2 +-
e-util/e-filter-option.h | 2 +-
e-util/e-filter-part.h | 2 +-
e-util/e-filter-rule.h | 2 +-
e-util/e-focus-tracker.h | 2 +-
e-util/e-image-chooser.h | 2 +-
e-util/e-import-assistant.h | 2 +-
e-util/e-import.h | 2 +-
e-util/e-interval-chooser.c | 4 +-
e-util/e-interval-chooser.h | 4 +-
e-util/e-map.h | 2 +-
e-util/e-marshal.list | 7 -
e-util/e-menu-tool-action.h | 2 +-
e-util/e-menu-tool-button.h | 2 +-
e-util/e-misc-utils.h | 7 +-
e-util/e-name-selector-dialog.h | 2 +-
e-util/e-name-selector-entry.h | 2 +-
e-util/e-name-selector-list.h | 2 +-
e-util/e-name-selector-model.h | 2 +-
e-util/e-name-selector.h | 2 +-
e-util/e-online-button.h | 2 +-
e-util/e-paned.h | 2 +-
e-util/e-passwords-win32.c | 1064 --
e-util/e-passwords.c | 102 +-
e-util/e-passwords.h | 50 +-
e-util/e-picture-gallery.h | 2 +-
e-util/e-plugin-ui.h | 2 +-
e-util/e-plugin.h | 20 +-
e-util/e-popup-action.h | 2 +-
e-util/e-preferences-window.h | 2 +-
e-util/e-preview-pane.h | 2 +-
e-util/e-printable.c | 7 +-
e-util/e-printable.h | 114 +-
e-util/e-reflow-model.h | 118 +-
e-util/e-reflow.h | 2 +-
e-util/e-rule-context.h | 2 +-
e-util/e-rule-editor.h | 2 +-
e-util/e-search-bar.h | 11 +-
e-util/e-selectable.h | 2 +-
e-util/e-selection-model-array.c | 8 +-
e-util/e-selection-model-array.h | 87 +-
e-util/e-selection-model-simple.c | 4 +-
e-util/e-selection-model-simple.h | 75 +-
e-util/e-selection-model.c | 2 +-
e-util/e-selection-model.h | 15 +-
e-util/e-send-options.c | 2 +-
e-util/e-send-options.h | 67 +-
e-util/e-sorter-array.c | 4 +-
e-util/e-sorter-array.h | 80 +-
e-util/e-sorter.c | 2 +-
e-util/e-sorter.h | 97 +-
e-util/e-source-combo-box.h | 2 +-
e-util/e-source-selector-dialog.h | 2 +-
e-util/e-source-selector.h | 2 +-
e-util/e-spell-entry.h | 55 +-
e-util/e-stock-request.h | 2 +-
e-util/e-table-config.h | 2 +-
e-util/e-table-extras.h | 3 +-
e-util/e-table-field-chooser-item.h | 28 +-
e-util/e-table-group-container.h | 4 +-
e-util/e-table-header-item.h | 2 +-
e-util/e-table-item.h | 136 +-
e-util/e-table-memory-callbacks.h | 18 +-
e-util/e-table-memory-store.h | 12 +-
e-util/e-table-selection-model.c | 5 +-
e-util/e-table-sorter.c | 2 +-
e-util/e-table.h | 2 +-
e-util/e-text-event-processor-emacs-like.c | 4 +-
e-util/e-text-event-processor-emacs-like.h | 50 +-
e-util/e-text-event-processor-types.h | 6 +-
e-util/e-text-event-processor.h | 58 +-
e-util/e-text-model.h | 155 +-
e-util/e-text.c | 2 +-
e-util/e-text.h | 78 +-
e-util/e-timezone-dialog.h | 2 +-
e-util/e-tree-model-generator.h | 2 +-
e-util/e-tree-model.h | 11 +-
e-util/e-tree.c | 52 +-
e-util/e-tree.h | 11 +-
e-util/e-ui-manager.h | 2 +-
e-util/e-unicode.h | 49 +-
e-util/e-url-entry.h | 42 +-
e-util/e-web-view-preview.c | 20 +-
e-util/e-web-view-preview.h | 6 +-
e-util/e-web-view.h | 28 +-
e-util/gal-define-views-dialog.c | 2 +-
e-util/gal-define-views-model.c | 13 +-
e-util/gal-define-views-model.h | 63 +-
e-util/gal-view-collection.c | 2 +-
e-util/gal-view-collection.h | 162 +-
e-util/gal-view-factory-etable.h | 2 +-
e-util/gal-view-instance-save-as-dialog.c | 2 +-
e-util/gal-view-instance.c | 2 +-
e-util/gal-view-instance.h | 107 +-
e-util/gal-view-new-dialog.c | 2 +-
e-util/gal-view-new-dialog.h | 56 +-
evolution-shell.pc.in | 2 +-
help/fr/fr.po | 2 +-
libemail-engine/e-mail-session.c | 138 +-
libemail-engine/e-mail-utils.c | 91 +-
mail/e-mail-config-auth-check.c | 1 +
mail/e-mail-migrate.c | 12 -
mail/e-mail-ui-session.c | 21 +-
mail/e-mail-ui-session.h | 9 +-
mail/em-config.c | 5 +-
mail/em-config.h | 3 +-
mail/em-folder-properties.c | 3 +-
modules/cal-config-google/e-google-chooser.c | 4 +-
modules/calendar/e-calendar-preferences.c | 7 +-
modules/mail/em-composer-prefs.c | 3 +-
modules/mail/em-mailer-prefs.c | 3 +-
modules/mail/em-network-prefs.c | 3 +-
plugins/publish-calendar/publish-calendar.c | 4 +-
plugins/publish-calendar/publish-location.c | 6 +-
plugins/publish-calendar/url-editor-dialog.c | 6 +-
po/POTFILES.in | 1 -
po/as.po |22799 +++++++++++-----------
po/nb.po |20439 ++++++++++----------
po/ru.po |24156 +++++++++++-------------
shell/e-shell-backend.c | 5 +-
shell/e-shell-migrate.c | 4 +-
shell/e-shell-migrate.h | 15 -
shell/e-shell-switcher.h | 2 +-
shell/e-shell-utils.c | 5 +-
shell/e-shell-view.c | 7 +-
shell/e-shell-view.h | 10 +
shell/e-shell-window-actions.c | 577 +-
shell/e-shell.h | 1 -
shell/es-event.c | 6 +-
shell/main.c | 8 +-
smime/gui/component.c | 4 +-
smime/lib/e-pkcs12.c | 2 +-
201 files changed, 37280 insertions(+), 38725 deletions(-)
---
diff --cc modules/mail/em-composer-prefs.c
index c48b9b5,58066e0..b9f5486
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@@ -330,12 -324,8 +330,11 @@@ em_composer_prefs_construct (EMComposer
prefs->builder = gtk_builder_new ();
e_load_ui_builder_definition (prefs->builder, "mail-config.ui");
+
+ prefs->spell_checker = e_spell_checker_instance();
+
/** @HookPoint-EMConfig: Mail Composer Preferences
* @Id: org.gnome.evolution.mail.composerPrefs
- * @Type: E_CONFIG_BOOK
* @Class: org.gnome.evolution.mail.config:1.0
* @Target: EMConfigTargetPrefs
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
