[evolution/express2: 14/14] Merge gnome-2-30 into express2 to get bugfixes

[Federico Mena Quintero <federico src gnome org>]

commit a16f08974d6955f843dddce3b9423c5349873488
Merge: 5b39734 ad1de0a
Author: Federico Mena Quintero <federico novell com>
Date:   Fri Apr 9 12:21:32 2010 -0500

    Merge gnome-2-30 into express2 to get bugfixes
    
    Note that express2 got some documentation for EExtensible and friends,
    and that documentation is not in gnome-2-30 yet.  We need to cherry-pick
    those commits into gnome-2-30 and elsewhere.

 .../gui/contact-editor/e-contact-quick-add.c       |    2 +
 capplet/settings/mail-view.c                       |    3 -
 configure.ac                                       |   45 ++-
 e-util/e-datetime-format.c                         |    3 +
 mail/e-mail-browser.c                              |   12 +-
 mail/e-mail-display.c                              |    4 +-
 mail/e-mail-reader.c                               |    4 +
 mail/em-format-html.c                              |   68 +--
 mail/message-list.c                                |    8 +-
 modules/Makefile.am                                |    7 +-
 modules/mail/em-composer-prefs.c                   |    4 +
 modules/windows-sens/Makefile.am                   |   20 +
 modules/windows-sens/evolution-windows-sens.c      |  602 ++++++++++++++++++++
 shell/e-shell-utils.c                              |    2 +
 shell/e-shell-window-private.c                     |    2 +
 widgets/misc/e-web-view.c                          |    2 +
 16 files changed, 722 insertions(+), 66 deletions(-)
---
diff --cc configure.ac
index 7701a76,bb82419..2ee9683
--- a/configure.ac
+++ b/configure.ac
@@@ -1143,18 -1143,42 +1144,53 @@@ f
  AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes])
  
  dnl ******************************
+ dnl Check for Windows SENS API
+ dnl ******************************
+ AC_ARG_ENABLE([sens],
+ 	[AS_HELP_STRING([--enable-sens],
+ 	[enable Windows SENS support (default=yes)])],
+ 	[enable_sens=$enableval],[enable_sens=yes])
+ if test "x$os_win32" = xyes; then
+ 	if test "x$enable_sens" = xyes; then
+ 		AC_CHECK_HEADER([rpc.h],[ enable_sens="yes" ],[ enable_sens="no" ])
+ 	fi
+ else
+ 	enable_sens="no"
+ fi
+ AC_MSG_CHECKING([if Windows SENS support is enabled])
+ AC_MSG_RESULT([$enable_sens])
+ if test "$enable_sens" = yes; then
+ 	SENS_LIBS="-lole32 -loleaut32 -luuid -lrpcrt4"
+ 	AC_CHECK_HEADER([eventsys.h],
+ 		[AC_DEFINE([HAVE_EVENTSYS_H], 1, [Have <eventsys.h>])],,
+ 		[[	#if HAVE_EVENTSYS_H
+ 			#include <eventsys.h>
+ 			#endif
+ 		]])
+ 	AC_CHECK_HEADER([sensevts.h],
+ 		[AC_DEFINE([HAVE_SENSEVTS_H], 1, [Have <sensevts.h>])],,
+ 		[[	#if HAVE_SENSEVTS_H
+ 			#include <sensevts.h>
+ 			#endif
+ 		]])
+ 	AC_SUBST(HAVE_SENS)
+ 	AC_SUBST(SENS_LIBS)
+ fi
 -
+ AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes])
+ 
+ dnl ******************************
 +dnl Enable ConnMan support ?
 +dnl ******************************
 +AC_ARG_ENABLE([connman],
 +	[AS_HELP_STRING([--enable-connman],
 +	[enable ConnMan support (default=no)])],
 +	[enable_connman=$enableval],[enable_connman=no])
 +if test "x$enable_nm$enable_connman" = "xyesyes"; then
 +	AC_MSG_ERROR([It is not possible to enable both ConnMan and NetworkManager])
 +fi
 +AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes])
 +
 +dnl ******************************
  dnl Camel Flags
  dnl ******************************
  EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS)
@@@ -1774,6 -1797,7 +1811,8 @@@ f
  echo "
  	LDAP support:		$msg_ldap
  	NetworkManager:		$enable_nm
+ 	Windows SENS:           $enable_sens
++	ConnMan:		$enable_connman
  	Pilot conduits:		$msg_pilot
  	Libnotify:		$HAVE_LIBNOTIFY
  	Kerberos 5:		$msg_krb5
diff --cc modules/Makefile.am
index c38f26b,653d1b6..4c0c38d
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@@ -10,10 -10,10 +10,14 @@@ if ENABLE_NETWORK_MANAGE
  NETWORK_MANAGER_DIR = network-manager
  endif
  
 +if ENABLE_CONNMAN
 +CONNMAN_DIR = connman
 +endif
 +
+ if ENABLE_WINDOWS_SENS
+ WINDOWS_SENS_DIR = windows-sens
+ endif
+ 
  SUBDIRS = \
  	addressbook \
  	calendar \
@@@ -21,7 -21,7 +25,8 @@@
  	plugin-lib \
  	$(MONO_DIR) \
  	$(PYTHON_DIR) \
- 	$(NETWORK_MANAGER_DIR)
+ 	$(NETWORK_MANAGER_DIR) \
 -	$(WINDOWS_SENS_DIR)
++	$(WINDOWS_SENS_DIR) \
 +	$(CONNMAN_DIR)
  
  -include $(top_srcdir)/git.mk
diff --cc modules/mail/em-composer-prefs.c
index eabde51,5746578..53a9888
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@@ -522,12 -517,11 +522,13 @@@ em_composer_prefs_construct (EMComposer
  		widget, "editor-created",
  		G_CALLBACK (e_shell_watch_window), shell);
  
 -	e_binding_new (
 -		shell_settings, "composer-format-html",
 -		widget, "prefer-html");
 +	/* Express mode does not honor this setting. */
 +	if (!e_shell_get_express_mode (shell))
 +		e_binding_new (
 +			shell_settings, "composer-format-html",
 +			widget, "prefer-html");
  
+ #ifndef G_OS_WIN32
  	e_binding_new_with_negation (
  		shell_settings, "disable-command-line",
  		widget, "allow-scripts");
diff --cc widgets/misc/e-web-view.c
index d245437,e9fc71d..beb865b
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@@ -1141,8 -1082,8 +1142,9 @@@ e_web_view_class_init (EWebViewClass *c
  			"Disable Save-to-Disk",
  			NULL,
  			FALSE,
 -			G_PARAM_READWRITE));
 +			G_PARAM_READWRITE |
 +			G_PARAM_CONSTRUCT));
+ #endif
  
  	g_object_class_install_property (
  		object_class,