From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Jan 2009 04:12:01 +0000 Subject: Merge revisions 36866:37046 from trunk. svn path=/branches/kill-bonobo/; revision=37050 --- mail/e-searching-tokenizer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail/e-searching-tokenizer.c') diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 044c3840b7..172a126c92 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -45,7 +45,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0, }; -static void e_searching_tokenizer_begin (HTMLTokenizer *, char *); +static void e_searching_tokenizer_begin (HTMLTokenizer *, const char *); static void e_searching_tokenizer_end (HTMLTokenizer *); static char *e_searching_tokenizer_peek_token (HTMLTokenizer *); static char *e_searching_tokenizer_next_token (HTMLTokenizer *); @@ -811,7 +811,7 @@ searcher_next_token(struct _searcher *s) s->current = token = (struct _token *)e_dlist_remhead(&s->output); - return token?token->tok:NULL; + return token ? g_strdup (token->tok) : NULL; } static char * @@ -1070,7 +1070,7 @@ static char *get_token(HTMLTokenizer *t) } static void -e_searching_tokenizer_begin (HTMLTokenizer *t, char *content_type) +e_searching_tokenizer_begin (HTMLTokenizer *t, const char *content_type) { ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t); struct _ESearchingTokenizerPrivate *p = st->priv; -- cgit v1.2.3