diff options
| -rw-r--r-- | camel/ChangeLog | 8 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 8 | ||||
| -rw-r--r-- | camel/providers/local/camel-local-summary.c | 3 |
3 files changed, 14 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 0659ce16e3..33803d647c 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,11 @@ +2001-10-30 <NotZed@Ximian.com> + + * camel-mime-utils.c (header_decode_mailbox): w(x) out some warnings. + + * providers/local/camel-local-summary.c + (camel_local_summary_load): Remove the warning about not loading + summary file - its a valid case for new folders. + 2001-10-29 Jeffrey Stedfast <fejj@ximian.com> * camel-tcp-stream-openssl.c (my_SSL_write): Removed. diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index b1bf54ca14..4f5edb43c4 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -71,7 +71,7 @@ int free_count = 0; #define g_free(x) (free_count++, g_free(x)) #endif -/* for all warnings ... */ +/* for all non-essential warnings ... */ #define w(x) #define d(x) @@ -2363,7 +2363,7 @@ header_decode_mailbox(const char **in) /* Fix for stupidly-broken-mailers that like to put '.''s in names unquoted */ /* see bug #8147 */ if (*inptr && *inptr != '<') { - g_warning("Working around stupid mailer bug #5: unescaped characters in names"); + w(g_warning("Working around stupid mailer bug #5: unescaped characters in names")); name = g_string_append_c(name, *inptr++); pre = header_decode_word(&inptr); } @@ -2434,8 +2434,8 @@ header_decode_mailbox(const char **in) if (*inptr && *inptr != ',') { char *text; - g_warning("We didn't get an '@' where we expected in '%s', trying again", *in); - g_warning("Name is '%s', Addr is '%s' we're at '%s'\n", name?name->str:"<UNSET>", addr->str, inptr); + w(g_warning("We didn't get an '@' where we expected in '%s', trying again", *in)); + w(g_warning("Name is '%s', Addr is '%s' we're at '%s'\n", name?name->str:"<UNSET>", addr->str, inptr)); /* need to keep *inptr, as try_address_again will drop the current character */ if (*inptr == '<') diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c index afde405172..508c7e0831 100644 --- a/camel/providers/local/camel-local-summary.c +++ b/camel/providers/local/camel-local-summary.c @@ -35,6 +35,7 @@ #include "camel/camel-mime-message.h" #include "camel/camel-stream-null.h" +#define w(x) #define io(x) #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ @@ -147,7 +148,7 @@ camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException if (forceindex || stat(s->summary_path, &st) == -1 || ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->load(cls, forceindex, ex) == -1) { - g_warning("Could not load summary: flags may be reset"); + w(g_warning("Could not load summary: flags may be reset")); camel_folder_summary_clear((CamelFolderSummary *)cls); return -1; } |