diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2011-02-25 08:10:00 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2011-02-25 08:10:00 +0000 |
| commit | 212887cb7478d45b4a4b8146a9617d1d88e99eae (patch) | |
| tree | df274189f367e377ed9c0e07d2317826af00557f /libsylph | |
| parent | 070e412f18875b74e329d932d65b2917d8d81bd7 (diff) | |
OS X: changed the location of settings to ~/Library/Application Support/Sylpheed .
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2848 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'libsylph')
| -rw-r--r-- | libsylph/defs.h | 2 | ||||
| -rw-r--r-- | libsylph/utils.c | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/libsylph/defs.h b/libsylph/defs.h index 8901b9c9..75c13a6d 100644 --- a/libsylph/defs.h +++ b/libsylph/defs.h @@ -44,7 +44,7 @@ #define DRAFT_DIR "draft" #define TRASH_DIR "trash" #define JUNK_DIR "junk" -#ifdef G_OS_WIN32 +#if defined(G_OS_WIN32) || defined(__APPLE__) # define RC_DIR "Sylpheed" #else # define RC_DIR ".sylpheed-2.0" diff --git a/libsylph/utils.c b/libsylph/utils.c index 3b1301a8..ac51271c 100644 --- a/libsylph/utils.c +++ b/libsylph/utils.c @@ -2205,6 +2205,15 @@ const gchar *get_document_dir(void) } return document_dir; +#elif defined(__APPLE__) + static const gchar *document_dir = NULL; + + if (!document_dir) { + document_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, + "Documents", NULL); + } + + return document_dir; #else return get_home_dir(); #endif @@ -2224,6 +2233,11 @@ const gchar *get_rc_dir(void) rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR, NULL); g_free(appdata); +#elif defined(__APPLE__) + rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, + "Library", G_DIR_SEPARATOR_S, + "Application Support", G_DIR_SEPARATOR_S, + RC_DIR, NULL); #else rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR, NULL); @@ -2246,7 +2260,7 @@ const gchar *get_old_rc_dir(void) const gchar *get_mail_base_dir(void) { -#ifdef G_OS_WIN32 +#if defined(G_OS_WIN32) || defined(__APPLE__) static gchar *mail_base_dir = NULL; if (!mail_base_dir) |