diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | libsylph/procmime.c | 11 | ||||
| -rw-r--r-- | src/compose.c | 4 |
4 files changed, 21 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2005-10-14 + * libsylph/procmime.c + src/compose.c: made some warnings just debug messages. + +2005-10-14 + * libsylph/codeconv.c: changed the locale charset of Japanese Windows from Shift_JIS to CP932. diff --git a/ChangeLog.ja b/ChangeLog.ja index ba7f4924..158ab24c 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,10 @@ 2005-10-14 + * libsylph/procmime.c + src/compose.c: いくつかの警告を単なるデバッグメッセージにした。 + +2005-10-14 + * libsylph/codeconv.c: 日本語 Windows のロケール文字コードを Shift_JIS から CP932 に変更。 diff --git a/libsylph/procmime.c b/libsylph/procmime.c index 7c2105b6..102f90ab 100644 --- a/libsylph/procmime.c +++ b/libsylph/procmime.c @@ -1004,10 +1004,17 @@ gchar *procmime_get_mime_type(const gchar *filename) MimeType *mime_type; const gchar *p; gchar *ext; + static gboolean no_mime_type_table = FALSE; + + if (no_mime_type_table) + return NULL; if (!mime_type_table) { mime_type_table = procmime_get_mime_type_table(); - if (!mime_type_table) return NULL; + if (!mime_type_table) { + no_mime_type_table = TRUE; + return NULL; + } } filename = g_basename(filename); @@ -1052,7 +1059,7 @@ static GHashTable *procmime_get_mime_type_table(void) mime_type_list = g_list_concat(mime_type_list, list); if (!mime_type_list) { - g_warning("mime.types not found\n"); + debug_print("mime.types not found\n"); return NULL; } } diff --git a/src/compose.c b/src/compose.c index 00565d42..7e46db86 100644 --- a/src/compose.c +++ b/src/compose.c @@ -1685,8 +1685,8 @@ static gchar *compose_get_signature_str(Compose *compose) if (compose->account->sig_type == SIG_FILE) { if (!is_file_or_fifo_exist(compose->account->sig_path)) { - g_warning("can't open signature file: %s\n", - compose->account->sig_path); + debug_print("can't open signature file: %s\n", + compose->account->sig_path); return NULL; } } |