new version. change evolution-data-server dep to 1.5 because in the e-utils directory the includes reference locations that are only present in eds > 1.5. add bogofilter/widescreen patch/useflag.

(Portage version: 2.1_pre6-r3)

5 files changed, 487 insertions, 14 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 43bb7f3b1ae3..636bb32582f4 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.113 2006/03/09 23:35:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.114 2006/03/18 22:42:56 allanonjl Exp $
+
+*evolution-2.6.0 (18 Mar 2006)
+
+  18 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/evolution-2.5.5.1-bf-junk.patch,
+  +files/evolution-2.5.5.1-sideview.patch, +evolution-2.6.0.ebuild:
+  new version. change evolution-data-server dep to 1.5 because in the e-utils
+  directory the includes reference locations that are only present in eds >
+  1.5. add bogofilter patch/useflag.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> evolution-2.4.2.1.ebuild:
   Mark 2.4.2.1 stable on ia64
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 0551c8f79d5d..8079456bfca7 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5c5dd5e2cf2530edbe7c33b1e3bb38b7 ChangeLog 32443
-RMD160 e7418f45481bc1b2be16a7ab7486a96d78ce06f6 ChangeLog 32443
-SHA256 066bac6a54dcc564a3e51b86fdadfd2b6a576b83b23237d163e2a4d1c652ec2d ChangeLog 32443
+MD5 70dc2cdb2504171680ffe0b8b8d9db3f ChangeLog 32833
+RMD160 31c0db942aee94793811989ae89e0cb320c538c9 ChangeLog 32833
+SHA256 97a697fa100e743915d36cc1e46abac57215a3b39a952a77f66ad81f7cfb6ae9 ChangeLog 32833
 MD5 95f6cf79b236723dc8e09937391dd4de evolution-1.2.4.ebuild 6245
 RMD160 5539a866e6b196898af7bd91fca67f3576a4f9f9 evolution-1.2.4.ebuild 6245
 SHA256 f2bdfdf19456786a2053b44b5a5b4a67db949790eac29cde7f626d9b8a67e3f0 evolution-1.2.4.ebuild 6245
@@ -25,6 +22,9 @@ SHA256 bdb9b441fa2edd27f8f1370edd52332cf7ad52646ddc953f0374617bf97a3c58 evolutio
 MD5 69340630836c71c73ff1fa374ff69ad3 evolution-2.4.2.ebuild 5663
 RMD160 d0a1781003d2920ef61c006bfff52fb45df5bf88 evolution-2.4.2.ebuild 5663
 SHA256 8b457aa42a973db38865303f27e8545f22c7ebbede54fdf9371799f4c88b333b evolution-2.4.2.ebuild 5663
+MD5 faaeb0f1b6e86e941b75e5c4b6b3b9d4 evolution-2.6.0.ebuild 6010
+RMD160 4ab67b11db265627a10e2d0b910ee21cadf78bd2 evolution-2.6.0.ebuild 6010
+SHA256 5af8486406c933030129542585330fdb71f54ca5d68ca24b6fd915a39121c143 evolution-2.6.0.ebuild 6010
 MD5 457d67c67b8f0b497d3f667be6e92577 files/digest-evolution-1.2.4 131
 RMD160 614d61109a19c2394fbfa3fe224838d949b2536b files/digest-evolution-1.2.4 131
 SHA256 beeb63042d60398528a1ecf13f8942476f91af281d12755d4db6758f9851cc65 files/digest-evolution-1.2.4 131
@@ -46,6 +46,9 @@ SHA256 2b5fceafd090f4a6db3b2e7a67599c9a908482d17b1c269d3da1942a479a33fb files/di
 MD5 c26dc1fd2762cde6c32c4c52d3ce9644 files/digest-evolution-2.4.2.1 262
 RMD160 59ab19f6fa13bb17b8756d4ea326d9827b839bf8 files/digest-evolution-2.4.2.1 262
 SHA256 66512ea95e1843f7da7daff072e06ae1c770a51c57cf954c66d8924ba2c9213c files/digest-evolution-2.4.2.1 262
+MD5 b7135bdb52f97014752d5b38603dff6c files/digest-evolution-2.6.0 533
+RMD160 0356403d31a87ee66ad947d6a3c9c6ae5f3c0213 files/digest-evolution-2.6.0 533
+SHA256 c9b2f3e30b0cd1b7dd81baddb73e424b997a4b7e32a1930bfcbd2d163fc0f768 files/digest-evolution-2.6.0 533
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 RMD160 64dd8efc58e99c0c2037ac47ffe6c6db5a15aafe files/evolution-1.1.90-kde.patch 689
 SHA256 efe5df721db55743cb9e63aca62ce03c77d82755ac57dd486eef3269adce0836 files/evolution-1.1.90-kde.patch 689
@@ -82,6 +85,9 @@ SHA256 37c1532a729000dbbacaaa56eea5485eeaa14ce78cc0dab3b4cc0fd839b0fc77 files/ev
 MD5 c6f7cb2777a5622bc3ea45b046713895 files/evolution-2.4.2.1-link.patch 2625
 RMD160 3a53cb7f6ad46265421fd66e9e6b15fc3bd98b17 files/evolution-2.4.2.1-link.patch 2625
 SHA256 8aa4091d36645b852f4e3ef604d76165806de9fcaf50d990a185546b62ca5b7d files/evolution-2.4.2.1-link.patch 2625
+MD5 9e370064cd61615da09034946b0f066e files/evolution-2.5.5.1-sideview.patch 9730
+RMD160 3df3caaf77487071e217b2803fe9357b9a6ab2c9 files/evolution-2.5.5.1-sideview.patch 9730
+SHA256 cdc2d507df2589ff37b33b72157e3522b5f031969962eef36022930babe5fcbd files/evolution-2.5.5.1-sideview.patch 9730
 MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
 RMD160 d1b4af439df342368d116582db364cef77c680cf files/evolution.formatstring.patch 2146
 SHA256 62570888f1fd7f537f9d6facea40ea835a7e1d7ea83c35cb92fde6a40cd67841 files/evolution.formatstring.patch 2146
@@ -91,10 +97,3 @@ SHA256 54bbdf9df28ac28af4aa457c432197bdcc428e97b69b052718a41400450b32cc files/ev
 MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 metadata.xml 285
 SHA256 0c662917bda7d3035eab7db55ade83dadca650d2ceddc44b7765ba5f898bd816 metadata.xml 285
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEELu+JrHF4yAQTrARAm2MAJ9q2RzKMUErzqeiqU2EPSFbsHlwXwCgkJLF
-bzzUeHeausMBW4HgcWFKXYU=
-=bOck
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.6.0.ebuild b/mail-client/evolution/evolution-2.6.0.ebuild
new file mode 100644
index 000000000000..a4be0d416c0a
--- /dev/null
+++ b/mail-client/evolution/evolution-2.6.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.0.ebuild,v 1.1 2006/03/18 22:42:56 allanonjl Exp $
+
+inherit eutils flag-o-matic alternatives gnome2 autotools
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bogofilter crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl static widescreen"
+
+# Pango dependency required to avoid font rendering problems
+# evolution-data-server dep is 1.5 because in the e-utils directories,
+# the includes reference locations only present in eds > 1.5
+RDEPEND=">=x11-themes/gnome-icon-theme-1.2
+	dev-libs/atk
+	>=gnome-extra/gtkhtml-3.9.90
+	>=dev-libs/glib-2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libbonobo-2
+	>=gnome-extra/evolution-data-server-1.5.90
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnome-2
+	>=net-libs/libsoup-2.2
+	>=x11-libs/pango-1.8.1
+	>=sys-apps/hal-0.5.4
+	pda? (
+		>=app-pda/gnome-pilot-2
+		>=app-pda/gnome-pilot-conduits-2 )
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( >=app-crypt/gnupg-1.2.2 )
+	ssl? ( >=dev-libs/nspr-4.4.1
+		   >=dev-libs/nss-3.9.2 )
+	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
+	dbus? ( sys-apps/dbus )
+	mono? ( >=dev-lang/mono-1 )
+	bogofilter? ( mail-filter/bogofilter )
+	!bogofilter? ( mail-filter/spamassassin )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+
+pkg_setup() {
+	G2CONF="--disable-default-binary \
+		--without-kde-applnk-path        \
+		$(use_enable ssl nss)            \
+		$(use_enable ssl smime)          \
+		$(use_enable ipv6)               \
+		$(use_enable mono)               \
+		$(use_enable nntp)               \
+		$(use_enable pda pilot-conduits) \
+		$(use_enable profile profiling)  \
+		$(use_with ldap openldap)        \
+		$(use_with kerberos krb5 /usr)	 \
+		$(use_enable static)"
+
+	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+
+	# Plug-ins to install. Normally we would want something similar to
+	# --enable-plugins=all (plugins_base + plugins_standard), except for some
+	# special cases.
+	local plugins="calendar-file calendar-http calendar-weather \
+		itip-formatter plugin-manager default-source addressbook-file \
+		startup-wizard print-message mark-all-read groupwise-features \
+		groupwise-account-setup mail-account-disable \
+		bbdb subject-thread save-calendar select-one-source copy-tool \
+		mail-to-task mark-calendar-offline mailing-list-actions       \
+		default-mailer"
+
+	if use bogofilter; then
+		plugins="${plugins} bf-junk-plugin"
+	else
+		plugins="${plugins} sa-junk-plugin"
+	fi
+
+	# The special cases
+	use gstreamer && plugins="${plugins} audio-inline"
+	use dbus && plugins="${plugins} new-mail-notify"
+	use mono && plugins="${plugins} mono"
+
+	if built_with_use gnome-extra/evolution-data-server ldap; then
+		plugins="${plugins} exchange-operations"
+	fi
+
+	local pluginlist=""
+	for p in $plugins; do
+		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
+		pluginlist="${pluginlist}${p}"
+	done
+
+	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	unpack ${PN}-2.5.5.1-bf-junk.tar.bz2
+	cd "${S}"
+
+	gnome2_omf_fix help/omf.make
+
+	# Accept the list of plugins separated by commas instead of spaces.
+	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
+
+	# Add bogofilter junk plugin source
+	use bogofilter && epatch ${WORKDIR}/${PN}-2.5.5.1-bf-junk.patch
+
+
+	# Add widescreen mode, if requested
+	use widescreen && epatch ${FILESDIR}/${PN}-2.5.5.1-sideview.patch
+
+	eaclocal || die
+	_elibtoolize --copy --force || die
+	eautoheader || die
+	eautomake || die
+	intltoolize --force || die
+	eautoconf || die
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		NSS_LIB=/usr/$(get_libdir)/nss
+		NSS_INC=/usr/include/nss
+		NSPR_LIB=/usr/$(get_libdir)/nspr
+		NSPR_INC=/usr/include/nspr
+
+		G2CONF="${G2CONF} \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB}     \
+			--with-nss-includes=${NSS_INC}   \
+			--with-nss-libs=${NSS_LIB}"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
+	einfo "To change the default browser if you are not using GNOME, do:"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	einfo ""
+	einfo "Replace 'mozilla %s' with which ever browser you use."
+}
diff --git a/mail-client/evolution/files/digest-evolution-2.6.0 b/mail-client/evolution/files/digest-evolution-2.6.0
new file mode 100644
index 000000000000..902ed13539ac
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.6.0
@@ -0,0 +1,6 @@
+MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+MD5 5c98650b2ccf3581e7cf5af3927b95d1 evolution-2.6.0.tar.bz2 12072895
+RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d evolution-2.6.0.tar.bz2 12072895
+SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d evolution-2.6.0.tar.bz2 12072895
diff --git a/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch b/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch
new file mode 100644
index 000000000000..8eb0e288f606
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch
@@ -0,0 +1,261 @@
+diff -u -ruN evolution-2.5.5.1.orig/mail/em-folder-browser.c evolution-2.5.5.1/mail/em-folder-browser.c
+--- evolution-2.5.5.1.orig/mail/em-folder-browser.c	2006-01-16 06:12:24.000000000 -0500
++++ evolution-2.5.5.1/mail/em-folder-browser.c	2006-01-21 00:12:22.000000000 -0500
+@@ -114,6 +114,8 @@
+ 	guint folder_changed_id;
+ 
+ 	EMMenu *menu;		/* toplevel menu manager */
++
++	int show_wide:1;
+ };
+ 
+ static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state);
+@@ -220,7 +222,9 @@
+ 		gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0);
+ 	}
+ 
+-	emfb->vpane = gtk_vpaned_new();
++	emfb->priv->show_wide = gconf_client_get_bool(mail_config_get_gconf_client(), "/apps/evolution/mail/display/show_wide", NULL);
++	emfb->vpane = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
++
+ 	g_signal_connect(emfb->vpane, "realize", G_CALLBACK(emfb_pane_realised), emfb);
+ 	emfb->priv->vpane_resize_id = g_signal_connect(emfb->vpane, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
+ 
+@@ -375,6 +379,33 @@
+ 	/* FIXME: need to update menu's to reflect ui changes */
+ }
+ 
++void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state)
++{
++	GtkWidget *w;
++
++	if ((emfb->priv->show_wide ^ state) == 0
++	    || emfb->view.list == NULL
++	    || emfb->view.preview_active == 0) {
++		emfb->priv->show_wide = state;
++		return;
++	}
++
++	emfb->priv->show_wide = state;
++
++	w = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
++
++	g_signal_handler_disconnect(emfb->vpane, emfb->priv->vpane_resize_id);
++	g_signal_connect(w, "realize", G_CALLBACK(emfb_pane_realised), emfb);
++	emfb->priv->vpane_resize_id = g_signal_connect(w, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
++
++	gtk_widget_show(w);
++	gtk_box_pack_start_defaults((GtkBox *)emfb, w);
++	gtk_widget_reparent((GtkWidget *)emfb->view.list, w);
++	gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w);
++	gtk_widget_destroy(emfb->vpane);
++	emfb->vpane = w;
++}
++
+ /* ********************************************************************** */
+ 
+ /* FIXME: Need to separate system rules from user ones */
+@@ -942,6 +973,21 @@
+ }
+ 
+ static void
++emfb_show_wide(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
++{
++	GConfClient *gconf;
++	EMFolderBrowser *emfb = data;
++
++	if (type != Bonobo_UIComponent_STATE_CHANGED)
++		return;
++
++	gconf = mail_config_get_gconf_client ();
++	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_wide", state[0] != '0', NULL);
++
++	em_folder_browser_show_wide(emfb, state[0] != '0');
++}
++
++static void
+ emfb_list_scrolled (MessageList *ml, EMFolderBrowser *emfb)
+ {
+ 	EMFolderView *emfv = (EMFolderView *) emfb;
+@@ -1220,6 +1266,12 @@
+ 		bonobo_ui_component_add_listener(uic, "ViewThreaded", emfb_view_threaded, emfv);
+ 		message_list_set_threaded(emfv->list, state);
+ 
++		/* Show wide display */
++		state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_wide", NULL);
++		bonobo_ui_component_set_prop(uic, "/commands/ViewWide", "state", state ? "1" : "0", NULL);
++		bonobo_ui_component_add_listener(uic, "ViewWide", emfb_show_wide, emfv);
++		em_folder_browser_show_wide((EMFolderBrowser *)emfv, state);
++
+ 		/* FIXME: Selection state */
+ 
+ 		/* FIXME: property menu customisation */
+diff -u -ruN evolution-2.5.5.1.orig/mail/em-folder-browser.h evolution-2.5.5.1/mail/em-folder-browser.h
+--- evolution-2.5.5.1.orig/mail/em-folder-browser.h	2005-05-16 03:53:53.000000000 -0400
++++ evolution-2.5.5.1/mail/em-folder-browser.h	2006-01-21 00:12:22.000000000 -0500
+@@ -51,6 +51,7 @@
+ GtkWidget *em_folder_browser_new(void);
+ 
+ void em_folder_browser_show_preview(EMFolderBrowser *emfv, gboolean state);
++void em_folder_browser_show_wide(EMFolderBrowser *emfv, gboolean state);
+ 
+ #ifdef __cplusplus
+ }
+diff -u -ruN evolution-2.5.5.1.orig/mail/evolution-mail.schemas.in.in evolution-2.5.5.1/mail/evolution-mail.schemas.in.in
+--- evolution-2.5.5.1.orig/mail/evolution-mail.schemas.in.in	2006-01-02 06:38:59.000000000 -0500
++++ evolution-2.5.5.1/mail/evolution-mail.schemas.in.in	2006-01-21 00:12:22.000000000 -0500
+@@ -360,6 +360,20 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/apps/evolution/mail/display/show_wide</key>
++      <applyto>/apps/evolution/mail/display/show_wide</applyto>
++      <owner>evolution-mail</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++         <short>Use side-by-side or vertical layout</short>
++         <long>
++	  If the &quot;Preview&quot; pane is on, then show it side-by-side rather than vertically.
++         </long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/apps/evolution/mail/display/fonts/variable</key>
+       <applyto>/apps/evolution/mail/display/fonts/variable</applyto>
+       <owner>evolution-mail</owner>
+diff -u -ruN evolution-2.5.5.1.orig/shell/apps_evolution_shell.schemas.in.in evolution-2.5.5.1/shell/apps_evolution_shell.schemas.in.in
+--- evolution-2.5.5.1.orig/shell/apps_evolution_shell.schemas.in.in	2005-03-21 16:40:25.000000000 -0500
++++ evolution-2.5.5.1/shell/apps_evolution_shell.schemas.in.in	2006-01-21 00:12:22.000000000 -0500
+@@ -131,6 +131,18 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/apps/evolution/shell/view_defaults/sidebar_visible</key>
++      <applyto>/apps/evolution/shell/view_defaults/sidebar_visible</applyto>
++      <owner>evolution</owner>
++      <type>bool</type>
++      <default>TRUE</default>
++      <locale name="C">
++        <short>Sidebar is visible</short>
++        <long>Whether the sidebar should be visible.</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/apps/evolution/shell/view_defaults/component_id</key>
+       <applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
+       <owner>evolution</owner>
+diff -u -ruN evolution-2.5.5.1.orig/shell/e-shell-window.c evolution-2.5.5.1/shell/e-shell-window.c
+--- evolution-2.5.5.1.orig/shell/e-shell-window.c	2006-01-09 02:51:27.000000000 -0500
++++ evolution-2.5.5.1/shell/e-shell-window.c	2006-01-21 00:12:22.000000000 -0500
+@@ -745,6 +745,15 @@
+ 				      visible ? "0" : "1",
+ 				      NULL);
+ 
++	visible = gconf_client_get_bool (gconf_client,
++						 "/apps/evolution/shell/view_defaults/sidebar_visible",
++						 NULL);
++	bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
++				      "/commands/ViewSidebar",
++				      "state",
++				      visible ? "1" : "0",
++				      NULL);
++
+ 	button_id = 0;
+ 	xml = g_string_new("");
+ 	for (p = e_component_registry_peek_list (registry); p != NULL; p = p->next) {
+@@ -803,6 +812,9 @@
+ 	gtk_box_pack_start (GTK_BOX (contents_vbox), priv->status_bar, FALSE, TRUE, 0);
+ 	gtk_widget_show (contents_vbox);
+ 
++	if (!visible)
++		gtk_widget_hide (priv->sidebar);
++
+ 	/* We only display this when a menu item is actually selected.  */
+ 	gtk_widget_hide (priv->menu_hint_label);
+ 
+@@ -810,7 +822,6 @@
+ 	g_object_unref (gconf_client);
+ }
+ 
+-
+ /* GObject methods.  */
+ 
+ static void
+@@ -1094,6 +1105,19 @@
+ 		g_free (prop);
+ 	}
+ 
++	prop = bonobo_ui_component_get_prop (e_shell_window_peek_bonobo_ui_component (window),
++					     "/commands/ViewSidebar",
++					     "state",
++					     NULL);
++	if (prop) {
++		visible = prop[0] == '1';
++		gconf_client_set_bool (client,
++				       "/apps/evolution/shell/view_defaults/sidebar_visible",
++				       visible,
++				       NULL);
++		g_free (prop);
++	}
++
+ 	g_object_unref (client);
+ }
+ 
+diff -u -ruN evolution-2.5.5.1.orig/shell/e-shell-window.h evolution-2.5.5.1/shell/e-shell-window.h
+--- evolution-2.5.5.1.orig/shell/e-shell-window.h	2006-01-02 06:39:13.000000000 -0500
++++ evolution-2.5.5.1/shell/e-shell-window.h	2006-01-21 00:12:22.000000000 -0500
+@@ -52,7 +52,7 @@
+ 
+ 
+ #include "e-shell.h"
+-
++#include "e-sidebar.h"
+ 
+ GType  e_shell_window_get_type  (void);
+ 
+diff -u -ruN evolution-2.5.5.1.orig/ui/evolution-mail-global.xml evolution-2.5.5.1/ui/evolution-mail-global.xml
+--- evolution-2.5.5.1.orig/ui/evolution-mail-global.xml	2006-01-16 06:12:29.000000000 -0500
++++ evolution-2.5.5.1/ui/evolution-mail-global.xml	2006-01-21 00:12:22.000000000 -0500
+@@ -35,6 +35,10 @@
+      accel="*Control*m"
+      type="toggle"/>
+ 
++    <cmd name="ViewWide"
++      _tip="Show message side-by-side with list"
++      type="toggle"/>
++ 
+   </commands>
+ 
+   <keybindings>
+@@ -52,6 +56,7 @@
+     <submenu name="View" _label="_View">
+       <placeholder name="ViewPreview">
+         <menuitem name="ViewPreview" verb="" _label="Message _Preview"/>
++        <menuitem name="ViewWide" verb="" _label="_View Side By Side"/>
+       </placeholder>
+ 
+       <separator f="" name="emailglobal"/>
+diff -u -ruN evolution-2.5.5.1.orig/ui/evolution.xml evolution-2.5.5.1/ui/evolution.xml
+--- evolution-2.5.5.1.orig/ui/evolution.xml	2006-01-16 06:12:29.000000000 -0500
++++ evolution-2.5.5.1/ui/evolution.xml	2006-01-21 00:13:47.000000000 -0500
+@@ -31,6 +31,9 @@
+     <cmd name="ViewStatusBar" _label="_View Status Bar" type="toggle"
+       _tip="View/Hide the Status Bar" state="1"/>
+ 
++    <cmd name="ViewSidebar" _label="_Sidebar" type="toggle"
++      _tip="Change the visibility of the sidebar" state="1"/>
++
+     <cmd name="HelpSubmitBug" _label="Submit Bug Report"
+       _tip="Submit a bug report using Bug Buddy"/>
+ 
+@@ -112,6 +115,7 @@
+       <placeholder name="ViewBegin"/>
+       <submenu name="Window" _label="_Window"/>
+       <menuitem name="ViewToolbar" id="ViewToolbar" verb=""/>
++      <menuitem name="ViewSidebar" id="ViewSidebar" verb=""/>
+       <menuitem name="ViewStatusBar" id="ViewStatusBar"/>
+       <placeholder name="ViewPreview"/>
+       <submenu name="Buttons" _label="_Switcher Appearance">