diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-10-30 04:06:29 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-10-30 04:06:29 +0800 |
| commit | 65f9e9cd94a701aee2ac89cf38009fa08157e887 (patch) | |
| tree | f130ab35c936b854d9f62f6b1fafe4e0ccec2c7c /camel/camel-charset-map.c | |
| parent | f860c394b4d093633a79c185cde2b4f95d01dad2 (diff) | |
| download | gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.tar gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.tar.gz gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.tar.bz2 gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.tar.lz gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.tar.xz gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.tar.zst gsoc2013-evolution-65f9e9cd94a701aee2ac89cf38009fa08157e887.zip | |
Remove md5-utils.h include since it's not part of Camel any more.
* camel.h: Remove md5-utils.h include since it's not part of Camel
any more.
* camel-charset-map.c: Kill some warnings.
* providers/nntp/camel-nntp-grouplist.c
(camel_nntp_get_grouplist_from_file, camel_nntp_grouplist_save):
Clean up warnings about time_t casts.
* providers/smtp/camel-smtp-transport.c: Remove unused md5-utils.h
include.
* providers/pop3/camel-pop3-store.c: Undefine the "_" macro
defined by krb4's des.h when compiling with krb support.
Fix md5-utils.h include.
svn path=/trunk/; revision=6253
Diffstat (limited to 'camel/camel-charset-map.c')
| -rw-r--r-- | camel/camel-charset-map.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c index b6ad0a5f37..ddc8f0a896 100644 --- a/camel/camel-charset-map.c +++ b/camel/camel-charset-map.c @@ -214,7 +214,6 @@ camel_charset_best_mask(unsigned int mask) const char * camel_charset_best(const char *in, int len) { - int i; unsigned int mask = ~0; int level = 0; const char *inptr = in, *inend = in+len; @@ -242,14 +241,12 @@ camel_charset_best(const char *in, int len) } } - switch(level) { - case 0: - return NULL; - case 1: + if (level == 1) return "ISO-8859-1"; - case 2: + else if (level == 2) return camel_charset_best_mask(mask); - } + else + return NULL; } |