[evolution/webkit-composer: 38/38] Merge branch 'master' into webkit-composer

[Dan VrÃtil <dvratil src gnome org>]

commit b6006a22e2310009b487fb61359e4d91805b255c
Merge: 20962b4 0c65652
Author: Dan VrÃtil <dvratil redhat com>
Date:   Mon Oct 22 16:42:13 2012 +0200

    Merge branch 'master' into webkit-composer
    
    Conflicts:
    	shell/Makefile.am

 Makefile.am                                        |    1 -
 NEWS                                               |   98 +
 calendar/gui/e-day-view.c                          |    5 +
 calendar/gui/itip-utils.c                          |    7 +-
 composer/e-composer-name-header.c                  |   18 +
 configure.ac                                       |   14 +-
 data/evolution.convert                             |    1 -
 doc/reference/shell/Makefile.am                    |    2 -
 e-util/e-dialog-utils.h                            |    2 +-
 em-format/e-mail-part-utils.c                      |    7 +-
 libemail-engine/e-mail-session-utils.c             |   14 +
 libemail-engine/mail-folder-cache.c                |    6 +-
 libemail-engine/mail-ops.c                         |   25 +-
 mail/e-mail-config-defaults-page.c                 |   26 +-
 mail/e-mail-display.c                              |  904 ++++---
 mail/e-mail-sidebar.c                              |   26 +
 mail/e-mail-sidebar.h                              |    3 +-
 mail/em-composer-utils.c                           |   55 +-
 mail/mail-config.ui                                |   74 +-
 mail/mail-send-recv.c                              |    3 +-
 mail/message-list.etspec                           |    2 +-
 modules/bogofilter/evolution-bogofilter.c          |   15 +-
 modules/book-config-ldap/e-source-ldap.c           |    6 +-
 .../evolution-book-config-webdav.c                 |    4 +-
 modules/cal-config-caldav/e-caldav-chooser.c       |   20 +-
 modules/cal-config-contacts/e-source-contacts.c    |    4 +-
 .../mail-config/e-mail-config-remote-accounts.c    |   13 +-
 .../mail-config/e-mail-config-sendmail-backend.c   |   58 +
 modules/mail/e-mail-shell-view.c                   |   48 +-
 modules/mail/em-composer-prefs.c                   |   12 +-
 modules/mail/evolution-module-mail.c               |   12 -
 modules/online-accounts/Makefile.am                |   13 +-
 modules/online-accounts/camel-sasl-xoauth.c        |  407 +--
 modules/online-accounts/camel-sasl-xoauth2.c       |  266 ++
 modules/online-accounts/camel-sasl-xoauth2.h       |   65 +
 .../online-accounts/evolution-online-accounts.c    |    2 +
 modules/prefer-plain/e-mail-parser-prefer-plain.c  |   23 +-
 modules/spamassassin/evolution-spamassassin.c      |   22 +-
 po/POTFILES.in                                     |    3 +-
 po/bg.po                                           | 2779 ++++----------------
 shell/Makefile.am                                  |    1 -
 shell/e-shell-window-actions.c                     |   11 +-
 shell/e-shell.c                                    |   56 +-
 shell/main.c                                       |   13 +-
 smclient/Makefile.am                               |   50 -
 smclient/README                                    |    2 -
 smclient/eggdesktopfile.c                          | 1505 -----------
 smclient/eggdesktopfile.h                          |  158 --
 smclient/eggsmclient-private.h                     |   52 -
 smclient/eggsmclient-win32.c                       |  349 ---
 smclient/eggsmclient-xsmp.c                        | 1389 ----------
 smclient/eggsmclient.c                             |  593 -----
 smclient/eggsmclient.h                             |  117 -
 widgets/misc/e-web-view.c                          |  186 +-
 54 files changed, 2009 insertions(+), 7538 deletions(-)
---
diff --cc doc/reference/shell/Makefile.am
index 6f51734,40004ab..b099d9f
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@@ -58,11 -59,10 +58,9 @@@ GTKDOC_LIBS=								
  	$(top_builddir)/shell/libeshell.la				\
  	$(top_builddir)/e-util/libeutil.la				\
  	$(top_builddir)/filter/libfilter.la				\
- 	$(top_builddir)/smclient/libeggsmclient.la			\
- 	$(top_builddir)/smclient/libeggdesktopfile.la			\
  	$(top_builddir)/widgets/menus/libmenus.la			\
  	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 -	$(EVOLUTION_DATA_SERVER_LIBS)					\
 -	$(GTKHTML_LIBS)
 +	$(EVOLUTION_DATA_SERVER_LIBS)
  
  # This includes the standard gtk-doc make rules, copied by gtkdocize.
  include $(top_srcdir)/gtk-doc.make
diff --cc shell/Makefile.am
index 841c97d,8e21c7e..b8eb75c
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@@ -92,8 -93,6 +92,7 @@@ libeshell_la_LDFLAGS = -avoid-version $
  libeshell_la_LIBADD =					\
  	$(top_builddir)/e-util/libeutil.la		\
  	$(top_builddir)/filter/libfilter.la		\
- 	$(top_builddir)/smclient/libeggsmclient.la	\
 +	$(top_builddir)/widgets/editor/libeeditor.la	\
  	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
  	$(top_builddir)/widgets/menus/libmenus.la	\
  	$(top_builddir)/libemail-utils/libemail-utils.la \