diff options
Diffstat (limited to 'camel/camel-filter-search.c')
| -rw-r--r-- | camel/camel-filter-search.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c index 2e35cb5e0d..9999b0ad2c 100644 --- a/camel/camel-filter-search.c +++ b/camel/camel-filter-search.c @@ -42,8 +42,9 @@ #include <signal.h> #include <sys/wait.h> -#include <libedataserver/e-sexp.h> -#include <libedataserver/e-iconv.h> +#include <e-util/e-sexp.h> + +#include <gal/util/e-iconv.h> #include "camel-mime-message.h" #include "camel-provider.h" @@ -54,7 +55,7 @@ #include "camel-stream-mem.h" #include "camel-stream-fs.h" #include "camel-search-private.h" -#include "camel-i18n.h" + #include "camel-url.h" #define d(x) @@ -364,7 +365,7 @@ user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessage /* performs an OR of all words */ for (i = 0; i < argc && !truth; i++) { if (argv[i]->type == ESEXP_RES_STRING - && camel_message_info_user_flag(fms->info, argv[i]->value.string)) { + && camel_flag_get (&fms->info->user_flags, argv[i]->value.string)) { truth = TRUE; break; } @@ -385,7 +386,7 @@ system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessa 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.bool = camel_system_flag_get (fms->info->flags, argv[0]->value.string); return r; } @@ -399,7 +400,7 @@ user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageS if (argc != 1 || argv[0]->type != ESEXP_RES_STRING) e_sexp_fatal_error(f, _("Invalid arguments to (user-tag)")); - tag = camel_message_info_user_tag(fms->info, argv[0]->value.string); + tag = camel_tag_get (&fms->info->user_tags, argv[0]->value.string); r = e_sexp_result_new (f, ESEXP_RES_STRING); r->value.string = g_strdup (tag ? tag : ""); @@ -490,7 +491,7 @@ get_size (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageS ESExpResult *r; r = e_sexp_result_new(f, ESEXP_RES_INT); - r->value.number = camel_message_info_size(fms->info) / 1024; + r->value.number = fms->info->size / 1024; return r; } |