[anjal] Update Evo patch for crash fix.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 5b275b3215cb6ef7b425c9ebe206272b61936e4a
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Tue May 19 12:15:24 2009 +0530

    Update Evo patch for crash fix.
---
 evo-anjal-2-27.patch |   22 +++++++++++++++++++---
 evo-anjal.patch      |   24 ++++++++++++++++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/evo-anjal-2-27.patch b/evo-anjal-2-27.patch
index 51ca1b0..b23fe0d 100644
--- a/evo-anjal-2-27.patch
+++ b/evo-anjal-2-27.patch
@@ -628,7 +628,7 @@ index c0c4708..79e972d 100644
  void		e_composer_text_header_set_text (EComposerTextHeader *header,
  						 const gchar *text);
 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
-index 3195255..0967eea 100644
+index 3195255..783f20f 100644
 --- a/composer/e-msg-composer.c
 +++ b/composer/e-msg-composer.c
 @@ -150,6 +150,8 @@ enum {
@@ -640,7 +640,23 @@ index 3195255..0967eea 100644
  static gpointer parent_class;
  static guint signals[LAST_SIGNAL];
  
-@@ -2473,6 +2475,7 @@ msg_composer_init (EMsgComposer *composer)
+@@ -1550,7 +1552,14 @@ msg_composer_update_preferences (GConfClient *client,
+ 	GError *error = NULL;
+ 
+ 	editor = GTKHTML_EDITOR (composer);
+-
++	
++	if (entry) {
++		if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 &&
++		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && 
++		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0)
++			return;
++	}
++					
+ 	enable = gconf_client_get_bool (
+ 		client, COMPOSER_GCONF_INLINE_SPELLING_KEY, &error);
+ 	if (error == NULL)
+@@ -2473,6 +2482,7 @@ msg_composer_init (EMsgComposer *composer)
  	GtkHTML *html;
  	gint n_targets;
  
@@ -648,7 +664,7 @@ index 3195255..0967eea 100644
  	composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
  
  	e_composer_private_init (composer);
-@@ -2685,6 +2688,32 @@ e_msg_composer_new (void)
+@@ -2685,6 +2695,32 @@ e_msg_composer_new (void)
  	return e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL);
  }
  
diff --git a/evo-anjal.patch b/evo-anjal.patch
index b8a1d7b..7b4d793 100644
--- a/evo-anjal.patch
+++ b/evo-anjal.patch
@@ -632,7 +632,7 @@ index c0c4708..79e972d 100644
  void		e_composer_text_header_set_text (EComposerTextHeader *header,
  						 const gchar *text);
 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
-index f06dc85..dc59953 100644
+index f06dc85..db221ae 100644
 --- a/composer/e-msg-composer.c
 +++ b/composer/e-msg-composer.c
 @@ -185,6 +185,8 @@ static struct {
@@ -644,7 +644,23 @@ index f06dc85..dc59953 100644
  static gpointer parent_class;
  static guint signals[LAST_SIGNAL];
  
-@@ -2800,6 +2802,7 @@ msg_composer_init (EMsgComposer *composer)
+@@ -1810,7 +1812,14 @@ msg_composer_update_preferences (GConfClient *client,
+ 	GError *error = NULL;
+ 
+ 	editor = GTKHTML_EDITOR (composer);
+-
++	
++	if (entry) {
++		if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 &&
++		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && 
++		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0)
++			return;
++	}
++					
+ 	enable = gconf_client_get_bool (
+ 		client, COMPOSER_GCONF_INLINE_SPELLING_KEY, &error);
+ 	if (error == NULL)
+@@ -2800,6 +2809,7 @@ msg_composer_init (EMsgComposer *composer)
  	GtkhtmlEditor *editor;
  	GtkHTML *html;
  
@@ -652,7 +668,7 @@ index f06dc85..dc59953 100644
  	composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
  
  	e_composer_private_init (composer);
-@@ -3050,6 +3053,32 @@ is_special_header (const gchar *hdr_name)
+@@ -3050,6 +3060,32 @@ is_special_header (const gchar *hdr_name)
  	return FALSE;
  }
  
@@ -1856,7 +1872,7 @@ index 95acd8b..2d92b1e 100644
  libefilterbar_la_LDFLAGS = $(NO_UNDEFINED)
  
 diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
-index 65b25c3..7e2afb3 100644
+index 65b25c3..ecc99be 100644
 --- a/widgets/misc/e-filter-bar.c
 +++ b/widgets/misc/e-filter-bar.c
 @@ -968,12 +968,28 @@ e_filter_bar_new (RuleContext *context,