[anjal: 3/3] Fix composer so ref.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 3dd0854ce3f4bf1914a5140afc77da21ae11ac4a
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Mon Mar 23 16:27:51 2009 +0530

    Fix composer so ref.
---
 evo-anjal.patch |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/evo-anjal.patch b/evo-anjal.patch
index 4160894..43ab615 100755
--- a/evo-anjal.patch
+++ b/evo-anjal.patch
@@ -438,7 +438,7 @@ index 7d4e72d..1c477f4 100644
  libfilter_la_LDFLAGS = $(NO_UNDEFINED)
  
 diff --git a/mail/Makefile.am b/mail/Makefile.am
-index e286a47..b2745ee 100644
+index e286a47..86e16dc 100644
 --- a/mail/Makefile.am
 +++ b/mail/Makefile.am
 @@ -31,7 +31,9 @@ INCLUDES =						\
@@ -491,7 +491,7 @@ index e286a47..b2745ee 100644
  	mail-session.h				\
  	mail-tools.h				\
  	message-list.h				\
-@@ -92,19 +105,81 @@ mailinclude_HEADERS =				\
+@@ -92,19 +105,82 @@ mailinclude_HEADERS =				\
  
  libevolution_mail_la_SOURCES =			\
  	$(MAIL_IDL_GENERATED)			\
@@ -545,7 +545,7 @@ index e286a47..b2745ee 100644
 +
 +
 +libevolution_mail_la_LIBADD =					\
-+	$(top_builddir)/mail/libevolution-mail-shared.la	\
++	$(top_builddir)/mail/libevolution-mail-shared.la	\								
 +	$(top_builddir)/e-util/libeutil.la			\
 +	$(top_builddir)/shell/libeshell.la			\
 +	$(top_builddir)/widgets/table/libetable.la		\
@@ -554,6 +554,9 @@ index e286a47..b2745ee 100644
 +	$(top_builddir)/widgets/misc/libefilterbar.la		\
 +	$(top_builddir)/filter/libfilter.la			\
 +	$(top_builddir)/widgets/menus/libmenus.la		\
++	$(top_builddir)/addressbook/util/libeabutil.la		\
++	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
++	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 +	$(top_builddir)/mail/importers/libevolution-mail-importers.la	\
 +	$(SMIME_LIBS)						\
 +	$(EVOLUTION_MAIL_LIBS)					\
@@ -574,12 +577,10 @@ index e286a47..b2745ee 100644
 +	em-account-editor.h			\
  	em-event.c				\
 +	em-config.c				\
-+	em-composer-utils.c			\
-+	em-composer-utils.h			\
  	em-filter-context.c			\
  	em-filter-context.h			\
  	em-filter-editor.c			\
-@@ -115,7 +190,8 @@ libevolution_mail_la_SOURCES =			\
+@@ -115,7 +191,8 @@ libevolution_mail_la_SOURCES =			\
  	em-filter-rule.h			\
  	em-filter-source-element.c		\
  	em-filter-source-element.h		\
@@ -589,7 +590,7 @@ index e286a47..b2745ee 100644
  	em-folder-properties.c			\
  	em-folder-properties.h			\
  	em-folder-selection-button.c		\
-@@ -124,34 +200,15 @@ libevolution_mail_la_SOURCES =			\
+@@ -124,34 +201,15 @@ libevolution_mail_la_SOURCES =			\
  	em-folder-selection.h			\
  	em-folder-selector.c			\
  	em-folder-selector.h			\
@@ -624,7 +625,7 @@ index e286a47..b2745ee 100644
  	em-sync-stream.c			\
  	em-utils.c				\
  	em-vfolder-context.c			\
-@@ -161,63 +218,43 @@ libevolution_mail_la_SOURCES =			\
+@@ -161,63 +219,39 @@ libevolution_mail_la_SOURCES =			\
  	em-vfolder-rule.c			\
  	em-vfolder-rule.h			\
  	mail-autofilter.c			\
@@ -673,15 +674,15 @@ index e286a47..b2745ee 100644
 -	$(top_builddir)/widgets/text/libetext.la		\
  	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 -	$(top_builddir)/widgets/misc/libefilterbar.la		\
++	$(top_builddir)/composer/libcomposer.la			\
  	$(top_builddir)/filter/libfilter.la			\
  	$(top_builddir)/widgets/menus/libmenus.la		\
-+	$(top_builddir)/composer/libcomposer.la			\
- 	$(top_builddir)/addressbook/util/libeabutil.la		\
- 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
- 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+-	$(top_builddir)/addressbook/util/libeabutil.la		\
+-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 -	$(top_builddir)/mail/importers/libevolution-mail-importers.la	\
  	$(SMIME_LIBS)						\
- 	$(EVOLUTION_MAIL_LIBS)					\
+-	$(EVOLUTION_MAIL_LIBS)					\
 -	$(GTKHTML_LIBS)						\
 -	$(REGEX_LIBS)						\
  	$(THREADS_LIBS)
@@ -697,7 +698,7 @@ index e286a47..b2745ee 100644
  server_in_files = GNOME_Evolution_Mail.server.in.in
  server_DATA = $(server_in_files:.server.in.in=.server)
 diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
-index 6b3e792..e96c016 100644
+index 54173a5..c871578 100644
 --- a/mail/em-folder-tree.c
 +++ b/mail/em-folder-tree.c
 @@ -110,6 +110,7 @@ struct _EMFolderTreePrivate {