[evolution/wip/gsettings: 9/9] Merge branch 'master' into wip/gsettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 1107fea0f8edff76d5956426044c9afe41c387fa
Merge: ceda5ef 88d5608
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Tue Nov 8 12:48:40 2011 +0100

    Merge branch 'master' into wip/gsettings

 calendar/gui/alarm-notify/notify-main.c            |    4 +
 configure.ac                                       |    2 +-
 doc/reference/shell/tmpl/action-groups.sgml        |  102 -
 doc/reference/shell/tmpl/e-account-combo-box.sgml  |  112 --
 doc/reference/shell/tmpl/e-account-manager.sgml    |   82 -
 doc/reference/shell/tmpl/e-account-tree-view.sgml  |   92 -
 doc/reference/shell/tmpl/e-account-utils.sgml      |   84 -
 doc/reference/shell/tmpl/e-action-combo-box.sgml   |  100 -
 doc/reference/shell/tmpl/e-activity-proxy.sgml     |   48 -
 doc/reference/shell/tmpl/e-activity.sgml           |  154 --
 doc/reference/shell/tmpl/e-alert.sgml              |   82 -
 doc/reference/shell/tmpl/e-attachment-button.sgml  |  102 -
 doc/reference/shell/tmpl/e-attachment-dialog.sgml  |   58 -
 doc/reference/shell/tmpl/e-attachment-handler.sgml |   58 -
 .../shell/tmpl/e-attachment-icon-view.sgml         |   47 -
 doc/reference/shell/tmpl/e-attachment-paned.sgml   |  124 --
 doc/reference/shell/tmpl/e-attachment-store.sgml   |  191 --
 .../shell/tmpl/e-attachment-tree-view.sgml         |   39 -
 doc/reference/shell/tmpl/e-attachment-view.sgml    |  427 ----
 doc/reference/shell/tmpl/e-attachment.sgml         |  413 ----
 doc/reference/shell/tmpl/e-binding.sgml            |  162 --
 doc/reference/shell/tmpl/e-bit-array.sgml          |  170 --
 doc/reference/shell/tmpl/e-categories-config.sgml  |   40 -
 doc/reference/shell/tmpl/e-datetime-format.sgml    |   69 -
 doc/reference/shell/tmpl/e-dialog-utils.sgml       |   71 -
 doc/reference/shell/tmpl/e-html-utils.sgml         |   99 -
 doc/reference/shell/tmpl/e-icon-factory.sgml       |   62 -
 doc/reference/shell/tmpl/e-logger.sgml             |   90 -
 doc/reference/shell/tmpl/e-poolv.sgml              |   67 -
 doc/reference/shell/tmpl/e-popup-action.sgml       |   58 -
 doc/reference/shell/tmpl/e-print.sgml              |   39 -
 doc/reference/shell/tmpl/e-selection.sgml          |  194 --
 doc/reference/shell/tmpl/e-shell-backend.sgml      |  134 --
 doc/reference/shell/tmpl/e-shell-content.sgml      |  133 --
 doc/reference/shell/tmpl/e-shell-searchbar.sgml    |  310 ---
 doc/reference/shell/tmpl/e-shell-settings.sgml     |  153 --
 doc/reference/shell/tmpl/e-shell-sidebar.sgml      |  129 --
 doc/reference/shell/tmpl/e-shell-switcher.sgml     |  109 -
 doc/reference/shell/tmpl/e-shell-taskbar.sgml      |   91 -
 doc/reference/shell/tmpl/e-shell-utils.sgml        |   78 -
 doc/reference/shell/tmpl/e-shell-view.sgml         |  429 ----
 doc/reference/shell/tmpl/e-shell-window.sgml       |  346 ----
 doc/reference/shell/tmpl/e-shell.sgml              |  417 ----
 doc/reference/shell/tmpl/e-signature-list.sgml     |  125 --
 doc/reference/shell/tmpl/e-signature-utils.sgml    |   78 -
 .../shell/tmpl/e-signature-utils.sgml.sgml         |  466 -----
 doc/reference/shell/tmpl/e-signature.sgml          |  222 ---
 doc/reference/shell/tmpl/e-util.sgml               |  449 -----
 doc/reference/shell/tmpl/e-xml-utils.sgml          |  219 --
 doc/reference/shell/tmpl/eshell-unused.sgml        |  811 --------
 doc/reference/shell/tmpl/gconf-bridge.sgml         |  142 --
 doc/reference/shell/tmpl/shell-actions.sgml        |  270 ---
 mail/em-account-editor.c                           | 2035 ++++++++++++-------
 mail/em-config.c                                   |  177 +-
 mail/em-config.h                                   |   38 +-
 mail/em-format-html.c                              |    2 +-
 mail/em-utils.c                                    |    4 +-
 mail/mail-config.ui                                |    8 +-
 mail/mail-mt.c                                     |    4 +-
 mail/mail-send-recv.c                              |    2 +-
 mail/message-list.c                                |   12 +-
 maint/evolution.xml                                |    3 +
 modules/mail/e-mail-config-hook.c                  |    2 +-
 plugins/backup-restore/backup-restore.c            |    8 +-
 .../org-gnome-backup-restore.eplug.xml             |    2 +-
 plugins/imap-features/imap-headers.c               |   32 +-
 .../org-gnome-imap-features.eplug.xml              |    2 +-
 plugins/pst-import/pst-importer.c                  |    3 +-
 po/lt.po                                           | 2075 +++++++-------------
 shell/main.c                                       |    3 +
 widgets/misc/Makefile.am                           |    2 +
 widgets/misc/e-auth-combo-box.c                    |  260 +++
 widgets/misc/e-auth-combo-box.h                    |   71 +
 widgets/misc/e-port-entry.c                        |  230 ++--
 74 files changed, 2613 insertions(+), 10915 deletions(-)
---