GNOME.org
 

[evolution-data-server] Avoid C++ keywords in headers.

commit 3b924a754d829cdb350ff572599cc016da297a3f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Apr 2 17:15:15 2010 -0400

    Avoid C++ keywords in headers.
    
    Particularly, in <libedataserver/e-sexp.h>.

 .../backends/groupwise/e-book-backend-groupwise.c  |   20 ++++----
 addressbook/backends/ldap/e-book-backend-ldap.c    |   20 ++++----
 addressbook/libebook/e-book-query.c                |   16 +++---
 addressbook/libedata-book/e-book-backend-sexp.c    |    8 ++--
 addressbook/libedata-book/e-book-backend-summary.c |    4 +-
 calendar/libedata-cal/e-cal-backend-sexp.c         |   34 +++++++-------
 camel/camel-filter-search.c                        |   30 ++++++------
 camel/camel-folder-search.c                        |   42 +++++++++---------
 camel/camel-search-sql-sexp.c                      |    8 ++--
 camel/providers/imap/camel-imap-search.c           |    6 +-
 libedataserver/e-sexp.c                            |   48 ++++++++++----------
 libedataserver/e-sexp.h                            |    4 +-
 12 files changed, 120 insertions(+), 120 deletions(-)
---
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 3b006e3..70f123d 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -1525,7 +1525,7 @@ func_and(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 	if (argc > 0)
 		e_gw_filter_group_conditions (filter, E_GW_FILTER_OP_AND, argc);
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1542,7 +1542,7 @@ func_or(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 	if (argc > 0)
 		 e_gw_filter_group_conditions (filter, E_GW_FILTER_OP_OR, argc);
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1556,7 +1556,7 @@ func_not(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 	sexp_data = (EBookBackendGroupwiseSExpData *) data;
 	sexp_data->is_filter_valid = FALSE;
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1583,7 +1583,7 @@ func_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 				/* ignore the NULL query */
 				sexp_data->is_filter_valid = FALSE;
 				r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-				r->value.bool = FALSE;
+				r->value.boolean = FALSE;
 				return r;
 			}
 		}
@@ -1617,7 +1617,7 @@ func_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1669,7 +1669,7 @@ func_is(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1701,7 +1701,7 @@ func_beginswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointe
 			/* ignore the NULL query */
 			sexp_data->is_filter_valid = FALSE;
 			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 			return r;
 		}
 
@@ -1746,7 +1746,7 @@ func_beginswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointe
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1762,7 +1762,7 @@ func_endswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
 
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -1815,7 +1815,7 @@ func_exists(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 449384d..1a90b97 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -3708,7 +3708,7 @@ func_and(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -3751,7 +3751,7 @@ func_or(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -3770,7 +3770,7 @@ func_not(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -3801,7 +3801,7 @@ func_contains(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 
 				/* ignore NULL query */
 				r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-				r->value.bool = FALSE;
+				r->value.boolean = FALSE;
 				return r;
 			}
 
@@ -3841,7 +3841,7 @@ func_contains(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -3874,7 +3874,7 @@ func_is(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -3898,7 +3898,7 @@ func_beginswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointe
 			ldap_data->list = g_list_prepend (ldap_data->list, g_strdup (""));
 
 			r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 			return r;
 		}
 
@@ -3933,7 +3933,7 @@ func_beginswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointe
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -3960,7 +3960,7 @@ func_endswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -4012,7 +4012,7 @@ func_exists(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
diff --git a/addressbook/libebook/e-book-query.c b/addressbook/libebook/e-book-query.c
index 5823715..3c0ca88 100644
--- a/addressbook/libebook/e-book-query.c
+++ b/addressbook/libebook/e-book-query.c
@@ -375,7 +375,7 @@ func_and(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -407,7 +407,7 @@ func_or(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -425,7 +425,7 @@ func_not(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -460,7 +460,7 @@ func_contains(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -489,7 +489,7 @@ func_is(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -518,7 +518,7 @@ func_beginswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointe
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -547,7 +547,7 @@ func_endswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
@@ -570,7 +570,7 @@ func_exists(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
+	r->value.boolean = FALSE;
 
 	return r;
 }
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index ab78282..d7892f3 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -384,7 +384,7 @@ entry_compare(SearchContext *ctx, struct _ESExp *f,
 		}
 	}
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -744,7 +744,7 @@ func_exists(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
 		}
 	}
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -776,7 +776,7 @@ func_exists_vcard(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpoin
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -820,7 +820,7 @@ e_book_backend_sexp_match_contact (EBookBackendSExp *sexp, EContact *contact)
 
 	r = e_sexp_eval(sexp->priv->search_sexp);
 
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
+	retval = (r && r->type == ESEXP_RES_BOOL && r->value.boolean);
 
 	g_object_unref(sexp->priv->search_context->contact);
 
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index c9acc5c..0d4d4bb 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -923,7 +923,7 @@ func_check(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer dat
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -984,7 +984,7 @@ e_book_backend_summary_is_summary_query (EBookBackendSummary *summary, const gch
 
 	r = e_sexp_eval(sexp);
 
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
+	retval = (r && r->type == ESEXP_RES_BOOL && r->value.boolean);
 
 	e_sexp_result_free(sexp, r);
 
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index 36f68ae..17d2f5f 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -312,7 +312,7 @@ func_uid (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 		equal = FALSE;
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = equal;
+	result->value.boolean = equal;
 
 	return result;
 }
@@ -393,7 +393,7 @@ func_occur_in_time_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer
 					default_zone);
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = ctx->occurs;
+	result->value.boolean = ctx->occurs;
 
 	return result;
 }
@@ -451,7 +451,7 @@ func_due_in_time_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer da
 		retval = FALSE;
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = retval;
+	result->value.boolean = retval;
 
 	e_cal_component_free_datetime (&dt);
 
@@ -679,7 +679,7 @@ func_has_attachment (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	}
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = e_cal_component_has_attachments (ctx->comp);
+	result->value.boolean = e_cal_component_has_attachments (ctx->comp);
 
 	return result;
 }
@@ -780,7 +780,7 @@ func_contains (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	}
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = matches;
+	result->value.boolean = matches;
 
 	return result;
 }
@@ -808,7 +808,7 @@ func_has_start (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 
 	e_cal_component_get_dtstart (ctx->comp, &dt);
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = dt.value != NULL;
+	result->value.boolean = dt.value != NULL;
 	e_cal_component_free_datetime (&dt);
 
 	return result;
@@ -835,7 +835,7 @@ func_has_alarms (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	}
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = e_cal_component_has_alarms (ctx->comp);
+	result->value.boolean = e_cal_component_has_alarms (ctx->comp);
 
 	return result;
 }
@@ -893,10 +893,10 @@ func_has_alarms_in_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
 	if (alarms) {
-		result->value.bool = TRUE;
+		result->value.boolean = TRUE;
 		e_cal_component_alarms_free (alarms);
 	} else
-		result->value.bool = FALSE;
+		result->value.boolean = FALSE;
 
 	return result;
 }
@@ -956,7 +956,7 @@ func_has_categories (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	e_cal_component_get_categories_list (ctx->comp, &categories);
 	if (!categories) {
 		result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-		result->value.bool = unfiled;
+		result->value.boolean = unfiled;
 
 		return result;
 	}
@@ -966,7 +966,7 @@ func_has_categories (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	 */
 	if (unfiled) {
 		result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-		result->value.bool = FALSE;
+		result->value.boolean = FALSE;
 
 		return result;
 	}
@@ -1002,7 +1002,7 @@ func_has_categories (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	e_cal_component_free_categories_list (categories);
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = matches;
+	result->value.boolean = matches;
 
 	return result;
 }
@@ -1028,7 +1028,7 @@ func_has_recurrences (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data
 	}
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = (e_cal_component_has_recurrences (ctx->comp) || e_cal_component_is_instance (ctx->comp));
+	result->value.boolean = (e_cal_component_has_recurrences (ctx->comp) || e_cal_component_is_instance (ctx->comp));
 
 	return result;
 }
@@ -1061,7 +1061,7 @@ func_is_completed (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
 	}
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = complete;
+	result->value.boolean = complete;
 
 	return result;
 }
@@ -1124,7 +1124,7 @@ func_completed_before (ESExp *esexp, gint argc, ESExpResult **argv, gpointer dat
 	}
 
 	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);
-	result->value.bool = retval;
+	result->value.boolean = retval;
 
 	return result;
 }
@@ -1237,7 +1237,7 @@ entry_compare(SearchContext *ctx, struct _ESExp *f,
 
 	}
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -1302,7 +1302,7 @@ e_cal_backend_sexp_match_comp (ECalBackendSExp *sexp, ECalComponent *comp, ECalB
 	}
 	r = e_sexp_eval(sexp->priv->search_sexp);
 
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
+	retval = (r && r->type == ESEXP_RES_BOOL && r->value.boolean);
 
 	g_object_unref (sexp->priv->search_context->comp);
 	g_object_unref (sexp->priv->search_context->backend);
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
index 01afb29..ed76a38 100644
--- a/camel/camel-filter-search.c
+++ b/camel/camel-filter-search.c
@@ -194,7 +194,7 @@ check_header (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMes
 	}
 
 	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = matched;
+	r->value.boolean = matched;
 
 	return r;
 }
@@ -245,7 +245,7 @@ header_exists (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMe
 	}
 
 	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = matched;
+	r->value.boolean = matched;
 
 	return r;
 }
@@ -263,10 +263,10 @@ header_regex (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMes
 	if (argc > 1 && argv[0]->type == ESEXP_RES_STRING
 	    && (contents = camel_medium_get_header (CAMEL_MEDIUM (message), argv[0]->value.string))
 	    && camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc-1, argv+1, fms->ex) == 0) {
-		r->value.bool = regexec (&pattern, contents, 0, NULL, 0) == 0;
+		r->value.boolean = regexec (&pattern, contents, 0, NULL, 0) == 0;
 		regfree (&pattern);
 	} else
-		r->value.bool = FALSE;
+		r->value.boolean = FALSE;
 
 	return r;
 }
@@ -309,11 +309,11 @@ header_full_regex (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Filt
 					   argc, argv, fms->ex) == 0) {
 		message = camel_filter_search_get_message (fms, f);
 		contents = get_full_header (message);
-		r->value.bool = regexec (&pattern, contents, 0, NULL, 0) == 0;
+		r->value.boolean = regexec (&pattern, contents, 0, NULL, 0) == 0;
 		g_free (contents);
 		regfree (&pattern);
 	} else
-		r->value.bool = FALSE;
+		r->value.boolean = FALSE;
 
 	return r;
 }
@@ -328,7 +328,7 @@ match_all (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, FilterMessageS
 		return e_sexp_term_eval (f, argv[0]);
 
 	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = TRUE;
+	r->value.boolean = TRUE;
 
 	return r;
 }
@@ -342,10 +342,10 @@ body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMe
 
 	if (camel_search_build_match_regex (&pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, fms->ex) == 0) {
 		message = camel_filter_search_get_message (fms, f);
-		r->value.bool = camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern);
+		r->value.boolean = camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern);
 		regfree (&pattern);
 	} else
-		r->value.bool = FALSE;
+		r->value.boolean = FALSE;
 
 	return r;
 }
@@ -360,10 +360,10 @@ body_regex (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMessa
 	if (camel_search_build_match_regex(&pattern, CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_NEWLINE,
 					   argc, argv, fms->ex) == 0) {
 		message = camel_filter_search_get_message (fms, f);
-		r->value.bool = camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern);
+		r->value.boolean = camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern);
 		regfree (&pattern);
 	} else
-		r->value.bool = FALSE;
+		r->value.boolean = FALSE;
 
 	return r;
 }
@@ -385,7 +385,7 @@ user_flag (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMessag
 	}
 
 	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -399,7 +399,7 @@ system_flag (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMess
 		e_sexp_fatal_error(f, _("Invalid arguments to (system-flag)"));
 
 	r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-	r->value.bool = camel_system_flag_get (camel_message_info_flags(fms->info), argv[0]->value.string);
+	r->value.boolean = camel_system_flag_get (camel_message_info_flags(fms->info), argv[0]->value.string);
 
 	return r;
 }
@@ -492,7 +492,7 @@ header_source (struct _ESExp *f, gint argc, struct _ESExpResult **argv, FilterMe
 	}
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -746,7 +746,7 @@ camel_filter_search_match (CamelSession *session,
 	}
 
 	if (result->type == ESEXP_RES_BOOL)
-		retval = result->value.bool ? CAMEL_SEARCH_MATCHED : CAMEL_SEARCH_NOMATCH;
+		retval = result->value.boolean ? CAMEL_SEARCH_MATCHED : CAMEL_SEARCH_NOMATCH;
 	else
 		retval = CAMEL_SEARCH_NOMATCH;
 
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 93ac4ee..5428696 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -709,7 +709,7 @@ search_dummy(struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolde
 
 	if (search->current == NULL) {
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = FALSE;
+		r->value.boolean = FALSE;
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 		r->value.ptrarray = g_ptr_array_new();
@@ -771,14 +771,14 @@ search_not(struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolderS
 			gint res = TRUE;
 
 			if (argv[0]->type == ESEXP_RES_BOOL)
-				res = !argv[0]->value.bool;
+				res = !argv[0]->value.boolean;
 
 			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-			r->value.bool = res;
+			r->value.boolean = res;
 		}
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = TRUE;
+		r->value.boolean = TRUE;
 	}
 
 	return r;
@@ -801,12 +801,12 @@ search_match_all(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, CamelFol
 		d(printf("matching against 1 message: %s\n", camel_message_info_subject(search->current)));
 
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = FALSE;
+		r->value.boolean = FALSE;
 
 		if (argc>0) {
 			r1 = e_sexp_term_eval(f, argv[0]);
 			if (r1->type == ESEXP_RES_BOOL) {
-				r->value.bool = r1->value.bool;
+				r->value.boolean = r1->value.boolean;
 			} else {
 				g_warning("invalid syntax, matches require a single bool result");
 				error_msg = g_strdup_printf(_("(%s) requires a single bool result"), "match-all");
@@ -815,7 +815,7 @@ search_match_all(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, CamelFol
 			}
 			e_sexp_result_free(f, r1);
 		} else {
-			r->value.bool = TRUE;
+			r->value.boolean = TRUE;
 		}
 		return r;
 	}
@@ -847,7 +847,7 @@ search_match_all(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, CamelFol
 		if (argc>0) {
 			r1 = e_sexp_term_eval(f, argv[0]);
 			if (r1->type == ESEXP_RES_BOOL) {
-				if (r1->value.bool)
+				if (r1->value.boolean)
 					g_ptr_array_add(r->value.ptrarray, (gchar *)uid);
 			} else {
 				g_warning("invalid syntax, matches require a single bool result");
@@ -1122,7 +1122,7 @@ check_header (struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFold
 	/* TODO: else, find all matches */
 
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
+	r->value.boolean = truth;
 
 	return r;
 }
@@ -1169,7 +1169,7 @@ search_header_exists (struct _ESExp *f, gint argc, struct _ESExpResult **argv, C
 	if (search->current) {
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
 		if (argc == 1 && argv[0]->type == ESEXP_RES_STRING)
-			r->value.bool = camel_medium_get_header(CAMEL_MEDIUM(search->current), argv[0]->value.string) != NULL;
+			r->value.boolean = camel_medium_get_header(CAMEL_MEDIUM(search->current), argv[0]->value.string) != NULL;
 
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
@@ -1202,10 +1202,10 @@ search_header_regex (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Ca
 		if (argc > 1 && argv[0]->type == ESEXP_RES_STRING
 		    && (contents = camel_medium_get_header (CAMEL_MEDIUM (msg), argv[0]->value.string))
 		    && camel_search_build_match_regex (&pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc-1, argv+1, search->priv->ex) == 0) {
-			r->value.bool = regexec (&pattern, contents, 0, NULL, 0) == 0;
+			r->value.boolean = regexec (&pattern, contents, 0, NULL, 0) == 0;
 			regfree (&pattern);
 		} else
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 
 		camel_object_unref (msg);
 	} else {
@@ -1255,12 +1255,12 @@ search_header_full_regex (struct _ESExp *f, gint argc, struct _ESExpResult **arg
 			gchar *contents;
 
 			contents = get_full_header (msg);
-			r->value.bool = regexec (&pattern, contents, 0, NULL, 0) == 0;
+			r->value.boolean = regexec (&pattern, contents, 0, NULL, 0) == 0;
 
 			g_free (contents);
 			regfree (&pattern);
 		} else
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 
 		camel_object_unref (msg);
 	} else {
@@ -1505,7 +1505,7 @@ search_body_contains(struct _ESExp *f, gint argc, struct _ESExpResult **argv, Ca
 			}
 		}
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
+		r->value.boolean = truth;
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 		r->value.ptrarray = g_ptr_array_new();
@@ -1558,10 +1558,10 @@ search_body_regex (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Came
 		r = e_sexp_result_new (f, ESEXP_RES_BOOL);
 
 		if (camel_search_build_match_regex (&pattern, CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_NEWLINE, argc, argv, search->priv->ex) == 0) {
-			r->value.bool = camel_search_message_body_contains ((CamelDataWrapper *) msg, &pattern);
+			r->value.boolean = camel_search_message_body_contains ((CamelDataWrapper *) msg, &pattern);
 			regfree (&pattern);
 		} else
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 
 		camel_object_unref (msg);
 	} else {
@@ -1618,7 +1618,7 @@ search_user_flag(struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelF
 			}
 		}
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
+		r->value.boolean = truth;
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 		r->value.ptrarray = g_ptr_array_new();
@@ -1641,7 +1641,7 @@ search_system_flag (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Cam
 			truth = camel_system_flag_get (camel_message_info_flags(search->current), argv[0]->value.string);
 
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
+		r->value.boolean = truth;
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 		r->value.ptrarray = g_ptr_array_new ();
@@ -1760,7 +1760,7 @@ search_uid(struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolderS
 			}
 		}
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = truth;
+		r->value.boolean = truth;
 	} else {
 		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 		r->value.ptrarray = g_ptr_array_new();
@@ -1803,7 +1803,7 @@ search_message_location (struct _ESExp *f, gint argc, struct _ESExpResult **argv
 
 	if (search->current) {
 		r = e_sexp_result_new (f, ESEXP_RES_BOOL);
-		r->value.bool = same ? TRUE : FALSE;
+		r->value.boolean = same ? TRUE : FALSE;
 	} else {
 		r = e_sexp_result_new (f, ESEXP_RES_ARRAY_PTR);
 		r->value.ptrarray = g_ptr_array_new ();
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index def0937..659b60f 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -193,7 +193,7 @@ eval_eq(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 			if (r2->type == ESEXP_RES_INT)
 				g_string_append_printf(str, "%d", r2->value.number);
 			if (r2->type == ESEXP_RES_BOOL)
-				g_string_append_printf(str, "%d", r2->value.bool);
+				g_string_append_printf(str, "%d", r2->value.boolean);
 			else if (r2->type == ESEXP_RES_TIME)
 				g_string_append_printf(str, "%ld", r2->value.time);
 			else if (r2->type == ESEXP_RES_STRING) {
@@ -238,7 +238,7 @@ eval_lt(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 		if (r2->type == ESEXP_RES_INT)
 			g_string_append_printf(str, "%d", r2->value.number);
 		if (r2->type == ESEXP_RES_BOOL)
-			g_string_append_printf(str, "%d", r2->value.bool);
+			g_string_append_printf(str, "%d", r2->value.boolean);
 		else if (r2->type == ESEXP_RES_TIME)
 			g_string_append_printf(str, "%ld", r2->value.time);
 		else if (r2->type == ESEXP_RES_STRING)
@@ -277,7 +277,7 @@ eval_gt(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 		if (r2->type == ESEXP_RES_INT)
 			g_string_append_printf(str, "%d", r2->value.number);
 		if (r2->type == ESEXP_RES_BOOL)
-			g_string_append_printf(str, "%d", r2->value.bool);
+			g_string_append_printf(str, "%d", r2->value.boolean);
 		else if (r2->type == ESEXP_RES_TIME)
 			g_string_append_printf(str, "%ld", r2->value.time);
 		else if (r2->type == ESEXP_RES_STRING)
@@ -302,7 +302,7 @@ match_all(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
 		r = e_sexp_term_eval(f, argv[0]);
 	else {
 		r = e_sexp_result_new(f, ESEXP_RES_STRING);
-		r->value.string = g_strdup(argv[0]->value.bool ? "1" : "0");
+		r->value.string = g_strdup(argv[0]->value.boolean ? "1" : "0");
 	}
 
 	return r;
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index ffde28a..be64496 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -440,7 +440,7 @@ imap_body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Cam
 	if (argc == 1 && argv[0]->value.string[0] == '\0') {
 		if (s->current) {
 			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-			r->value.bool = TRUE;
+			r->value.boolean = TRUE;
 		} else {
 			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 			r->value.ptrarray = g_ptr_array_new ();
@@ -452,7 +452,7 @@ imap_body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Cam
 		/* nothing to match case, do nothing (should be handled higher up?) */
 		if (s->current) {
 			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 		} else {
 			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 			r->value.ptrarray = g_ptr_array_new ();
@@ -473,7 +473,7 @@ imap_body_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, Cam
 			for (i=0;i<j && !truth;i++)
 				truth = *uidp++ == uidn;
 			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-			r->value.bool = truth;
+			r->value.boolean = truth;
 		} else {
 			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);
 			array = r->value.ptrarray = g_ptr_array_new();
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index 84440ae..f054ddb 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -281,7 +281,7 @@ term_eval_and(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer da
 				g_hash_table_insert(ht, a1[j], GINT_TO_POINTER(n+1));
 			}
 		} else if (r1->type == ESEXP_RES_BOOL) {
-			bool = bool && r1->value.bool;
+			bool = bool && r1->value.boolean;
 		}
 		e_sexp_result_free(f, r1);
 	}
@@ -294,7 +294,7 @@ term_eval_and(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer da
 		r->value.ptrarray = lambdafoo.uids;
 	} else if (type == ESEXP_RES_BOOL) {
 		r->type = ESEXP_RES_BOOL;
-		r->value.bool = bool;
+		r->value.boolean = bool;
 	}
 
 	g_hash_table_destroy(ht);
@@ -340,7 +340,7 @@ term_eval_or(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer dat
 				g_hash_table_insert(ht, a1[j], (gpointer)1);
 			}
 		} else if (r1->type == ESEXP_RES_BOOL) {
-			bool |= r1->value.bool;
+			bool |= r1->value.boolean;
 		}
 		e_sexp_result_free(f, r1);
 	}
@@ -353,7 +353,7 @@ term_eval_or(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer dat
 		r->value.ptrarray = lambdafoo.uids;
 	} else if (type == ESEXP_RES_BOOL) {
 		r->type = ESEXP_RES_BOOL;
-		r->value.bool = bool;
+		r->value.boolean = bool;
 	}
 	g_hash_table_destroy(ht);
 
@@ -369,11 +369,11 @@ term_eval_not(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 
 	if (argc>0) {
 		if (argv[0]->type == ESEXP_RES_BOOL
-		    && argv[0]->value.bool)
+		    && argv[0]->value.boolean)
 			res = FALSE;
 	}
 	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = res;
+	r->value.boolean = res;
 	return r;
 }
 
@@ -395,13 +395,13 @@ term_eval_lt(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer dat
 			e_sexp_fatal_error(f, "Incompatible types in compare <");
 		} else if (r1->type == ESEXP_RES_INT) {
 			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.number < r2->value.number;
+			r->value.boolean = r1->value.number < r2->value.number;
 		} else if (r1->type == ESEXP_RES_TIME) {
 			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.time < r2->value.time;
+			r->value.boolean = r1->value.time < r2->value.time;
 		} else if (r1->type == ESEXP_RES_STRING) {
 			r->type = ESEXP_RES_BOOL;
-			r->value.bool = strcmp(r1->value.string, r2->value.string) < 0;
+			r->value.boolean = strcmp(r1->value.string, r2->value.string) < 0;
 		}
 		e_sexp_result_free(f, r1);
 		e_sexp_result_free(f, r2);
@@ -427,13 +427,13 @@ term_eval_gt(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer dat
 			e_sexp_fatal_error(f, "Incompatible types in compare >");
 		} else if (r1->type == ESEXP_RES_INT) {
 			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.number > r2->value.number;
+			r->value.boolean = r1->value.number > r2->value.number;
 		} else if (r1->type == ESEXP_RES_TIME) {
 			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.time > r2->value.time;
+			r->value.boolean = r1->value.time > r2->value.time;
 		} else if (r1->type == ESEXP_RES_STRING) {
 			r->type = ESEXP_RES_BOOL;
-			r->value.bool = strcmp(r1->value.string, r2->value.string) > 0;
+			r->value.boolean = strcmp(r1->value.string, r2->value.string) > 0;
 		}
 		e_sexp_result_free(f, r1);
 		e_sexp_result_free(f, r2);
@@ -453,15 +453,15 @@ term_eval_eq(struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer dat
 		r1 = e_sexp_term_eval(f, argv[0]);
 		r2 = e_sexp_term_eval(f, argv[1]);
 		if (r1->type != r2->type) {
-			r->value.bool = FALSE;
+			r->value.boolean = FALSE;
 		} else if (r1->type == ESEXP_RES_INT) {
-			r->value.bool = r1->value.number == r2->value.number;
+			r->value.boolean = r1->value.number == r2->value.number;
 		} else if (r1->type == ESEXP_RES_BOOL) {
-			r->value.bool = r1->value.bool == r2->value.bool;
+			r->value.boolean = r1->value.boolean == r2->value.boolean;
 		} else if (r1->type == ESEXP_RES_TIME) {
-			r->value.bool = r1->value.time == r2->value.time;
+			r->value.boolean = r1->value.time == r2->value.time;
 		} else if (r1->type == ESEXP_RES_STRING) {
-			r->value.bool = strcmp(r1->value.string, r2->value.string) == 0;
+			r->value.boolean = strcmp(r1->value.string, r2->value.string) == 0;
 		}
 		e_sexp_result_free(f, r1);
 		e_sexp_result_free(f, r2);
@@ -593,7 +593,7 @@ term_eval_castint(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpoin
 		r->value.number = argv[0]->value.number;
 		break;
 	case ESEXP_RES_BOOL:
-		r->value.number = argv[0]->value.bool != 0;
+		r->value.number = argv[0]->value.boolean != 0;
 		break;
 	case ESEXP_RES_STRING:
 		r->value.number = strtoul(argv[0]->value.string, NULL, 10);
@@ -621,7 +621,7 @@ term_eval_caststring(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gp
 		r->value.string = g_strdup_printf("%d", argv[0]->value.number);
 		break;
 	case ESEXP_RES_BOOL:
-		r->value.string = g_strdup_printf("%d", argv[0]->value.bool != 0);
+		r->value.string = g_strdup_printf("%d", argv[0]->value.boolean != 0);
 		break;
 	case ESEXP_RES_STRING:
 		r->value.string = g_strdup(argv[0]->value.string);
@@ -643,7 +643,7 @@ term_eval_if (struct _ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer da
 
 	if (argc >=2 && argc<=3) {
 		r = e_sexp_term_eval(f, argv[0]);
-		doit = (r->type == ESEXP_RES_BOOL && r->value.bool);
+		doit = (r->type == ESEXP_RES_BOOL && r->value.boolean);
 		e_sexp_result_free(f, r);
 		if (doit) {
 			return e_sexp_term_eval(f, argv[1]);
@@ -700,7 +700,7 @@ e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)
 	case ESEXP_TERM_BOOL:
 		r(printf(" (gint %d)\n", t->value.number));
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-		r->value.bool = t->value.bool;
+		r->value.boolean = t->value.boolean;
 		break;
 	case ESEXP_TERM_TIME:
 		r(printf(" (time_t %d)\n", t->value.time));
@@ -758,7 +758,7 @@ eval_dump_result(ESExpResult *r, gint depth)
 		printf("string: '%s'\n", r->value.string);
 		break;
 	case ESEXP_RES_BOOL:
-		printf("bool: %c\n", r->value.bool?'t':'f');
+		printf("bool: %c\n", r->value.boolean?'t':'f');
 		break;
 	case ESEXP_RES_TIME:
 		printf("time_t: %ld\n", (glong) r->value.time);
@@ -793,7 +793,7 @@ parse_dump_term(struct _ESExpTerm *t, gint depth)
 		printf(" %d", t->value.number);
 		break;
 	case ESEXP_TERM_BOOL:
-		printf(" #%c", t->value.bool?'t':'f');
+		printf(" #%c", t->value.boolean?'t':'f');
 		break;
 	case ESEXP_TERM_TIME:
 		printf(" %ld", (glong) t->value.time);
@@ -970,7 +970,7 @@ parse_value(ESExp *f)
 		}
 
 		t = parse_term_new(f, ESEXP_TERM_BOOL);
-		t->value.bool = (str[0] == 't');
+		t->value.boolean = (str[0] == 't');
 		break; }
 	case G_TOKEN_SYMBOL:
 		s = g_scanner_cur_value(gs).v_symbol;
diff --git a/libedataserver/e-sexp.h b/libedataserver/e-sexp.h
index 5f57f58..d7f0bad 100644
--- a/libedataserver/e-sexp.h
+++ b/libedataserver/e-sexp.h
@@ -54,7 +54,7 @@ struct _ESExpResult {
 		GPtrArray *ptrarray;
 		gint number;
 		gchar *string;
-		gint bool;
+		gint boolean;
 		time_t time;
 	} value;
 };
@@ -92,7 +92,7 @@ struct _ESExpTerm {
 	union {
 		gchar *string;
 		gint number;
-		gint bool;
+		gint boolean;
 		time_t time;
 		struct {
 			struct _ESExpSymbol *sym;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]