diff options
author | James Booth <boothj5@gmail.com> | 2012-11-25 21:40:49 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2012-11-25 21:40:49 +0000 |
commit | 4b73f3d7f92e3af6e7ebf3a9551477820024d9d3 (patch) | |
tree | 17fdae49e46c5860d993a906ba80fcbc87506a34 /src/preferences.c | |
parent | 7ea02c718225e1d5701fd686bd2c3718d8327235 (diff) | |
download | profani-tty-4b73f3d7f92e3af6e7ebf3a9551477820024d9d3.tar.gz |
Profanity files now use %XDG_CONFIG_HOME and %XDG_DATA_HOME
Diffstat (limited to 'src/preferences.c')
-rw-r--r-- | src/preferences.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/preferences.c b/src/preferences.c index b2db3123..5fbce0ef 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -20,9 +20,6 @@ * */ -#include "config.h" -#include "preferences.h" - #include <stdlib.h> #include <string.h> @@ -34,10 +31,13 @@ #include <ncurses/ncurses.h> #endif +#include "config.h" +#include "files.h" #include "log.h" +#include "preferences.h" #include "prof_autocomplete.h" -static GString *prefs_loc; +static gchar *prefs_loc; static GKeyFile *prefs; gint log_maxsize = 0; @@ -53,11 +53,10 @@ prefs_load(void) log_info("Loading preferences"); login_ac = p_autocomplete_new(); - prefs_loc = g_string_new(getenv("HOME")); - g_string_append(prefs_loc, "/.profanity/config"); + prefs_loc = files_get_preferences_file(); prefs = g_key_file_new(); - g_key_file_load_from_file(prefs, prefs_loc->str, G_KEY_FILE_KEEP_COMMENTS, + g_key_file_load_from_file(prefs, prefs_loc, G_KEY_FILE_KEEP_COMMENTS, NULL); // create the logins searchable list for autocompletion @@ -378,5 +377,5 @@ _save_prefs(void) { gsize g_data_size; char *g_prefs_data = g_key_file_to_data(prefs, &g_data_size, NULL); - g_file_set_contents(prefs_loc->str, g_prefs_data, g_data_size, NULL); + g_file_set_contents(prefs_loc, g_prefs_data, g_data_size, NULL); } |