diff options
author | James Booth <boothj5@gmail.com> | 2016-07-24 21:35:12 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2016-07-24 21:49:35 +0100 |
commit | a3a73cf0031fef7b4012b27bc1955c406175f0fe (patch) | |
tree | a9bfba0b9899eff139a9a8e5436468e35d6b7e91 /src/ui | |
parent | 29452f8f1b8f7a61773905169b3883f1b494c786 (diff) | |
download | profani-tty-a3a73cf0031fef7b4012b27bc1955c406175f0fe.tar.gz |
Move all filepath handling to files.c
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/inputwin.c | 2 | ||||
-rw-r--r-- | src/ui/tray.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 6a4093e1..fb7c0b4a 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -428,7 +428,7 @@ _inp_rl_startup_hook(void) rl_variable_bind("disable-completion", "on"); // check for and load ~/.config/profanity/inputrc - char *inputrc = files_get_inputrc_path(); + char *inputrc = files_get_inputrc_file(); if (inputrc) { rl_read_init_file(inputrc); free(inputrc); diff --git a/src/ui/tray.c b/src/ui/tray.c index ab0d26e0..374eefb7 100644 --- a/src/ui/tray.c +++ b/src/ui/tray.c @@ -79,10 +79,8 @@ _get_icons(void) #endif /* ICONS_PATH */ - gchar *xdg_config = files_get_xdg_config_home(); - icons_dir = g_string_new(xdg_config); - g_free(xdg_config); - g_string_append(icons_dir, "/profanity/icons"); + char *icons_dir_s = files_get_config_path(DIR_ICONS); + icons_dir = g_string_new(icons_dir_s); GError *err = NULL; if (!g_file_test(icons_dir->str, G_FILE_TEST_IS_DIR)) { return; |