[evolution] Use CamelSExp instead of ESExp in filter, mail.

[Matthew Barnes <mbarnes src gnome org>]

commit 907df00ad0ca6b1380f74eac62dc114a492849d6
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Nov 14 22:03:42 2011 -0500

    Use CamelSExp instead of ESExp in filter, mail.

 filter/e-filter-color.c         |    3 +--
 filter/e-filter-element.h       |    1 +
 filter/e-filter-file.c          |    4 +---
 filter/e-filter-input.c         |    4 +---
 filter/e-filter-int.c           |    2 --
 filter/e-filter-option.c        |    4 +---
 filter/e-filter-part.c          |    2 +-
 mail/em-filter-folder-element.c |    3 +--
 mail/em-filter-source-element.c |    4 +---
 9 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/filter/e-filter-color.c b/filter/e-filter-color.c
index bf80fbb..1540841 100644
--- a/filter/e-filter-color.c
+++ b/filter/e-filter-color.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-sexp.h>
 
 #include "e-filter-color.h"
 
@@ -127,7 +126,7 @@ filter_color_format_sexp (EFilterElement *element,
 
 	g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
 		fc->color.red, fc->color.green, fc->color.blue);
-	e_sexp_encode_string (out, spec);
+	camel_sexp_encode_string (out, spec);
 }
 
 static void
diff --git a/filter/e-filter-element.h b/filter/e-filter-element.h
index 9abd83c..c0bcadd 100644
--- a/filter/e-filter-element.h
+++ b/filter/e-filter-element.h
@@ -25,6 +25,7 @@
 #define E_FILTER_ELEMENT_H
 
 #include <gtk/gtk.h>
+#include <camel/camel.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include <e-util/e-alert.h>
diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c
index a5199fe..baf75e7 100644
--- a/filter/e-filter-file.c
+++ b/filter/e-filter-file.c
@@ -31,8 +31,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <libedataserver/e-sexp.h>
-
 #include "e-util/e-alert.h"
 
 #include "e-filter-file.h"
@@ -203,7 +201,7 @@ filter_file_format_sexp (EFilterElement *element,
 {
 	EFilterFile *file = E_FILTER_FILE (element);
 
-	e_sexp_encode_string (out, file->path);
+	camel_sexp_encode_string (out, file->path);
 }
 
 static void
diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c
index 10fa1f1..8b92f54 100644
--- a/filter/e-filter-input.c
+++ b/filter/e-filter-input.c
@@ -32,8 +32,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-sexp.h>
-
 #include "e-util/e-alert.h"
 
 #include "e-filter-input.h"
@@ -243,7 +241,7 @@ filter_input_format_sexp (EFilterElement *element,
 	GList *link;
 
 	for (link = input->values; link != NULL; link = g_list_next (link))
-		e_sexp_encode_string (out, link->data);
+		camel_sexp_encode_string (out, link->data);
 }
 
 static void
diff --git a/filter/e-filter-int.c b/filter/e-filter-int.c
index dcb9b18..883c560 100644
--- a/filter/e-filter-int.c
+++ b/filter/e-filter-int.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
-#include <libedataserver/e-sexp.h>
-
 #include "e-filter-int.h"
 
 G_DEFINE_TYPE (
diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c
index 0cea021..2f5af12 100644
--- a/filter/e-filter-option.c
+++ b/filter/e-filter-option.c
@@ -31,8 +31,6 @@
 #include <glib/gi18n.h>
 #include <gmodule.h>
 
-#include <libedataserver/e-sexp.h>
-
 #include "e-filter-option.h"
 #include "e-filter-part.h"
 
@@ -409,7 +407,7 @@ filter_option_format_sexp (EFilterElement *element,
 	EFilterOption *option = E_FILTER_OPTION (element);
 
 	if (option->current)
-		e_sexp_encode_string (out, option->current->value);
+		camel_sexp_encode_string (out, option->current->value);
 }
 
 static void
diff --git a/filter/e-filter-part.c b/filter/e-filter-part.c
index 0b31097..2154699 100644
--- a/filter/e-filter-part.c
+++ b/filter/e-filter-part.c
@@ -501,7 +501,7 @@ e_filter_part_expand_code (EFilterPart *part,
 #if 0
 		} else if ((val = g_hash_table_lookup (part->globals, name))) {
 			g_string_append_printf (out, "%.*s", newstart-start, start);
-			e_sexp_encode_string (out, val);
+			camel_sexp_encode_string (out, val);
 #endif
 		} else {
 			g_string_append_printf (out, "%.*s", (gint)(end-start+1), start);
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index 74f3864..6098c93 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -36,7 +36,6 @@
 #include "mail/em-utils.h"
 #include "shell/e-shell.h"
 #include "filter/e-filter-part.h"
-#include "libedataserver/e-sexp.h"
 #include "e-util/e-alert.h"
 
 #define EM_FILTER_FOLDER_ELEMENT_GET_PRIVATE(obj) \
@@ -264,7 +263,7 @@ filter_folder_element_format_sexp (EFilterElement *fe,
 {
 	EMFilterFolderElement *ff = (EMFilterFolderElement *) fe;
 
-	e_sexp_encode_string (out, ff->priv->uri);
+	camel_sexp_encode_string (out, ff->priv->uri);
 }
 
 static void
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index b95c140..b6d518d 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -32,8 +32,6 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 
-#include <libedataserver/e-sexp.h>
-
 #include <e-util/e-account-utils.h>
 #include <filter/e-filter-part.h>
 
@@ -402,7 +400,7 @@ filter_source_element_format_sexp (EFilterElement *fe,
 {
 	EMFilterSourceElement *fs = (EMFilterSourceElement *) fe;
 
-	e_sexp_encode_string (out, fs->priv->active_id);
+	camel_sexp_encode_string (out, fs->priv->active_id);
 }
 
 static void