diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/e-searching-tokenizer.c | 6 | ||||
| -rw-r--r-- | mail/folder-info.h | 2 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-folder-cache.c | 1 |
5 files changed, 18 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index eb6de02302..28e7705544 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +2002-07-18 Ettore Perazzoli <ettore@ximian.com> + + * mail-folder-cache.c: Removed bogus static pre-declaration. + + * e-searching-tokenizer.c (e_searching_tokenizer_end): Removed + unused variables. + + * mail-callbacks.c: #include <gtkhtml.h>. + + * folder-info.h (evolution_folder_info_get_type): Add prototype. + 2002-07-18 Peter Williams <peterw@ximian.com> * mail-format.c (handle_multipart_digest): Change the HTML to diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 014d52a60b..cedbf4ea20 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -1089,12 +1089,12 @@ e_searching_tokenizer_begin (HTMLTokenizer *t, gchar *content_type) static void e_searching_tokenizer_end (HTMLTokenizer *t) { - ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t); - struct _ESearchingTokenizerPrivate *p = st->priv; - /* so end gets called before any get/next tokens. I dont get it. */ #if 0 + ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t); + struct _ESearchingTokenizerPrivate *p = st->priv; + /* not sure if we should reset search every time ... *shrug* */ if (p->engine) { searcher_free(p->engine); diff --git a/mail/folder-info.h b/mail/folder-info.h index b8d6d29f1f..13266c5c04 100644 --- a/mail/folder-info.h +++ b/mail/folder-info.h @@ -30,7 +30,9 @@ extern "C" { #endif /* __cplusplus */ #include <glib.h> +#include <gtk/gtktypeutils.h> +GtkType evolution_folder_info_get_type (void); gboolean evolution_folder_info_factory_init (void); void evolution_folder_info_notify_ready (void); diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index dfd071863b..6edf281d5e 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -43,6 +43,8 @@ #include <gal/widgets/e-unicode.h> #include <e-util/e-dialog-utils.h> #include <filter/filter-editor.h> +#include <gtkhtml.h> + #include "mail.h" #include "folder-browser-window.h" #include "message-browser.h" diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 511be60e90..91001fa577 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -100,7 +100,6 @@ struct _store_info { }; static void folder_changed(CamelObject *o, gpointer event_data, gpointer user_data); -static void folder_deleted(CamelObject *o, gpointer event_data, gpointer user_data); static void folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data); static void folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data); |