diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-01-15 02:24:35 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-01-15 02:24:35 +0000 |
commit | d4f0efec8c5a80fc34c828120bc75992c218815e (patch) | |
tree | e6c9bc7c3918500df599a53e2dcc55c6cb77a68c | |
parent | ca966048d1d2f4edf84c7791c3d5cfe001c8fd7c (diff) |
get_domain_name(): win32: return correct domain name (if possible).
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1476 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.ja | 5 | ||||
-rw-r--r-- | libsylph/utils.c | 9 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2007-01-15 + + * libsylph/utils.c: get_domain_name(): win32: return correct domain + name (if possible). + 2007-01-12 * src/account_dialog.c: account_edit_create(): place edit account diff --git a/ChangeLog.ja b/ChangeLog.ja index b265436d..6060fe30 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,8 @@ +2007-01-15 + + * libsylph/utils.c: get_domain_name(): win32: 正しいドメイン名を + (可能であれば)返すようにした。 + 2007-01-12 * src/account_dialog.c: account_edit_create(): アカウント編集 diff --git a/libsylph/utils.c b/libsylph/utils.c index f8f5d005..677cffc3 100644 --- a/libsylph/utils.c +++ b/libsylph/utils.c @@ -1996,7 +1996,6 @@ gchar *get_tmp_file(void) const gchar *get_domain_name(void) { -#ifdef G_OS_UNIX static gchar *domain_name = NULL; if (!domain_name) { @@ -2017,12 +2016,14 @@ const gchar *get_domain_name(void) } debug_print("domain name = %s\n", domain_name); + if (is_next_nonascii(domain_name)) { + g_warning("invalid domain name: %s\n", domain_name); + g_free(domain_name); + domain_name = "unknown"; + } } return domain_name; -#else - return "unknown"; -#endif } off_t get_file_size(const gchar *file) |