summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 80d1784)
raw | patch | inline | side by side (parent: 80d1784)
author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | |
Wed, 4 Jan 2012 19:36:04 +0000 (20:36 +0100) | ||
committer | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | |
Wed, 4 Jan 2012 19:36:04 +0000 (20:36 +0100) |
This name is consistent with g_build_filename and it better reflects
the fact that memory is allocatd by this function.
the fact that memory is allocatd by this function.
src/conf.c | patch | blob | history | |
src/conf.h | patch | blob | history | |
src/screen_keydef.c | patch | blob | history |
diff --git a/src/conf.c b/src/conf.c
index cf87c005d508dd4700fdc9da0f665118b03c3ce3..5f35d205d5d70369a0918d2f5cd4e349d2af5b1c 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
}
char *
-get_user_key_binding_filename(void)
+build_user_key_binding_filename(void)
{
return g_build_filename(g_get_home_dir(), "." PACKAGE, "keys", NULL);
}
/* check for user key bindings ~/.ncmpc/keys */
if (filename == NULL) {
- filename = get_user_key_binding_filename();
+ filename = build_user_key_binding_filename();
if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
g_free(filename);
filename = NULL;
diff --git a/src/conf.h b/src/conf.h
index a031ff6efe1008051e78b0c4e7ea85e3c09cd55d..b8e4ed232d59bf94fde477f09b0002c2fcf12087 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
int check_user_conf_dir(void);
-char *get_user_key_binding_filename(void);
+char *build_user_key_binding_filename(void);
int read_configuration(void);
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index d768352854d06873caf7aeb8774cc951c7365969..bb581390743a934e2e3d2aaa5e9cdd182a3e0a85 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
return -1;
}
- filename = get_user_key_binding_filename();
+ filename = build_user_key_binding_filename();
if ((f = fopen(filename,"w")) == NULL) {
screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));