[evolution: 1446/1446] Merge branch 'wip/gsettings'

[Matthew Barnes <mbarnes src gnome org>]

commit 9918361aef9ad1360a0ed3a240cc58d6cd9e30f8
Merge: fa1bb9a e64d6fe
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Nov 22 20:48:44 2011 -0500

    Merge branch 'wip/gsettings'

 addressbook/gui/contact-editor/Makefile.am         |    1 +
 addressbook/gui/contact-editor/e-contact-editor.c  |   18 +-
 addressbook/gui/widgets/eab-config.c               |   12 +-
 addressbook/gui/widgets/eab-config.h               |    7 +-
 calendar/gui/alarm-notify/alarm-notify.c           |    3 +-
 calendar/gui/alarm-notify/alarm.c                  |    1 -
 calendar/gui/alarm-notify/alarm.h                  |    1 -
 calendar/gui/alarm-notify/config-data.c            |  128 ++---
 calendar/gui/alarm-notify/config-data.h            |    2 -
 calendar/gui/calendar-config.c                     |   90 ++--
 calendar/gui/calendar-config.h                     |   13 +-
 calendar/gui/calendar-view-factory.c               |    1 -
 calendar/gui/calendar-view.c                       |    1 -
 calendar/gui/comp-util.c                           |    1 -
 calendar/gui/dialogs/alarm-dialog.c                |    1 -
 calendar/gui/dialogs/alarm-list-dialog.c           |    1 -
 calendar/gui/dialogs/cancel-comp.c                 |    1 -
 calendar/gui/dialogs/changed-comp.c                |    1 -
 calendar/gui/dialogs/comp-editor-util.c            |    1 -
 calendar/gui/dialogs/comp-editor.c                 |   39 +-
 calendar/gui/dialogs/delete-comp.c                 |    1 -
 calendar/gui/dialogs/delete-error.c                |    1 -
 calendar/gui/dialogs/recur-comp.c                  |    1 -
 calendar/gui/dialogs/send-comp.c                   |    1 -
 calendar/gui/e-cal-config.c                        |    6 +-
 calendar/gui/e-cal-config.h                        |    2 +-
 calendar/gui/e-day-view-time-item.c                |   21 +-
 calendar/gui/e-week-view.c                         |   43 +-
 calendar/gui/gnome-cal.c                           |    7 -
 calendar/gui/itip-utils.c                          |   10 +-
 calendar/importers/icalendar-importer.c            |   16 +-
 capplet/settings/mail-account-view.c               |   43 +-
 composer/e-composer-header-table.c                 |   56 +--
 composer/e-composer-private.c                      |   43 +--
 composer/e-composer-private.h                      |   33 -
 composer/e-msg-composer.c                          |  103 ++--
 configure.ac                                       |    2 +
 data/Makefile.am                                   |   33 +-
 data/evolution.convert                             |  282 +++++++++
 .../org.gnome.evolution.addressbook.gschema.xml.in |   54 ++
 data/org.gnome.evolution.bogofilter.gschema.xml.in |    9 +
 data/org.gnome.evolution.calendar.gschema.xml.in   |  319 ++++++++++
 data/org.gnome.evolution.gschema.xml.in            |   19 +
 data/org.gnome.evolution.importer.gschema.xml.in   |   14 +
 data/org.gnome.evolution.mail.gschema.xml.in       |  619 ++++++++++++++++++++
 ...ution.plugin.attachment-reminder.gschema.xml.in |    9 +
 ...me.evolution.plugin.autocontacts.gschema.xml.in |   39 ++
 ...ution.plugin.email-custom-header.gschema.xml.in |    9 +
 ...evolution.plugin.external-editor.gschema.xml.in |   14 +
 ...me.evolution.plugin.face-picture.gschema.xml.in |    9 +
 .../org.gnome.evolution.plugin.itip.gschema.xml.in |    9 +
 ...olution.plugin.mail-notification.gschema.xml.in |   49 ++
 ...me.evolution.plugin.prefer-plain.gschema.xml.in |   14 +
 ...gnome.evolution.plugin.templates.gschema.xml.in |    9 +
 data/org.gnome.evolution.shell.gschema.xml.in      |   94 +++
 ...org.gnome.evolution.spamassassin.gschema.xml.in |   29 +
 e-util/e-datetime-format.c                         |    4 +-
 e-util/e-plugin.c                                  |   37 +-
 e-util/e-signature-list.c                          |   11 +-
 e-util/e-signature-list.h                          |    5 +-
 e-util/e-signature-utils.c                         |   10 +-
 e-util/e-signature.c                               |    1 -
 e-util/e-util.c                                    |    2 +-
 em-format/em-format-quote.c                        |   11 +-
 em-format/em-format.c                              |   13 +-
 ...mail-error-failed-to-append-to-sent-folder.page |   32 +
 help/C/mail-error-folder-mismatch.page             |   52 ++
 help/C/mail-error-no-provider-available.page       |   49 ++
 libgnomecanvas/gnome-canvas-pixbuf.c               |    1 -
 libgnomecanvas/gnome-canvas-text.c                 |    1 -
 mail/e-mail-attachment-bar.c                       |   15 +-
 mail/e-mail-browser.c                              |   11 +-
 mail/e-mail-label-list-store.c                     |  125 ++++-
 mail/e-mail-paned-view.c                           |   23 +-
 mail/e-mail-reader.c                               |   95 ++--
 mail/e-mail-session.c                              |   98 +--
 mail/em-account-editor.c                           |  121 +++--
 mail/em-composer-utils.c                           |   81 ++--
 mail/em-config.c                                   |    1 -
 mail/em-folder-properties.c                        |   12 +-
 mail/em-subscription-editor.c                      |   45 +-
 mail/em-utils.c                                    |   33 +-
 mail/mail-autoconfig/Makefile.am                   |    2 +
 mail/mail-config.c                                 |  200 ++-----
 mail/mail-config.ui                                |    1 +
 mail/mail-vfolder.c                                |   12 +-
 mail/message-list.c                                |   70 +--
 modules/addressbook/autocompletion-config.c        |    8 +-
 modules/addressbook/e-book-shell-backend.c         |    9 +-
 modules/addressbook/e-book-shell-content.c         |   18 +-
 modules/addressbook/e-book-shell-settings.c        |   11 +-
 modules/addressbook/e-book-shell-view-actions.c    |   18 +-
 modules/addressbook/e-book-shell-view-private.c    |    4 +-
 modules/bogofilter/evolution-bogofilter.c          |   13 +-
 modules/calendar/e-cal-shell-backend.c             |   41 +-
 modules/calendar/e-cal-shell-content.c             |   33 +-
 modules/calendar/e-cal-shell-settings.c            |  108 +++--
 modules/calendar/e-cal-shell-sidebar.c             |   13 +-
 modules/calendar/e-calendar-preferences.c          |   16 +-
 modules/calendar/e-memo-shell-backend.c            |   41 +-
 modules/calendar/e-memo-shell-content.c            |   14 +-
 modules/calendar/e-memo-shell-view-actions.c       |   15 +-
 modules/calendar/e-task-shell-backend.c            |   41 +-
 modules/calendar/e-task-shell-content.c            |   16 +-
 modules/calendar/e-task-shell-view-actions.c       |   15 +-
 modules/mail/e-mail-shell-backend.c                |   60 +--
 modules/mail/e-mail-shell-settings.c               |  176 ++++--
 modules/mail/e-mail-shell-view-actions.c           |   17 +-
 modules/mail/em-mailer-prefs.c                     |  139 +++---
 modules/mail/em-mailer-prefs.h                     |    3 +-
 modules/mailto-handler/evolution-mailto-handler.c  |    3 +-
 modules/network-manager/Makefile.am                |    1 +
 modules/online-accounts/e-online-accounts-google.c |    2 +-
 modules/spamassassin/evolution-spamassassin.c      |   55 +-
 plugins/attachment-reminder/attachment-reminder.c  |   57 +-
 plugins/bbdb/bbdb.c                                |  141 ++---
 plugins/bbdb/bbdb.h                                |   16 +-
 plugins/bbdb/gaimbuddies.c                         |   29 +-
 plugins/external-editor/external-editor.c          |   52 +-
 plugins/face/face.c                                |   14 +-
 plugins/itip-formatter/itip-formatter.c            |   27 +-
 plugins/mail-notification/mail-notification.c      |  112 ++---
 plugins/mail-to-task/mail-to-task.c                |    8 +-
 plugins/mark-all-read/mark-all-read.c              |    1 -
 plugins/prefer-plain/prefer-plain.c                |   27 +-
 plugins/pst-import/pst-importer.c                  |    9 +-
 plugins/save-calendar/rdf-format.c                 |   10 +-
 plugins/templates/templates.c                      |   38 +-
 shell/e-shell-backend.c                            |   11 +-
 shell/e-shell-migrate.c                            |   30 +-
 shell/e-shell-searchbar.c                          |    9 +-
 shell/e-shell-settings.c                           |  229 ++++----
 shell/e-shell-settings.h                           |    3 +-
 shell/e-shell-sidebar.c                            |   17 +-
 shell/e-shell-switcher.c                           |   19 +-
 shell/e-shell-taskbar.c                            |   11 +-
 shell/e-shell-view.c                               |   11 +-
 shell/e-shell-window-private.c                     |   58 +--
 shell/e-shell-window-private.h                     |    4 +
 shell/e-shell-window.c                             |    3 +-
 shell/e-shell.c                                    |   25 +-
 shell/main.c                                       |   68 +--
 widgets/misc/e-attachment-paned.c                  |   14 +-
 widgets/misc/e-attachment.c                        |   14 +-
 widgets/table/e-table-field-chooser-item.c         |    3 +
 widgets/table/e-table-header-utils.c               |    2 +
 146 files changed, 3526 insertions(+), 1955 deletions(-)
---