nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add backwards compatibility for icon_folders option

Browse Source 
Existing configurations will continue to work but now print a warning.
New, icon_path option takes precedence if both options are used.
If icon_folders option is used, its usage string also appears in --help
output.
This commit is contained in:
George Angelopoulos 2017-07-30 18:34:33 +02:00
parent 4d03acc454
commit 9acb9fd255
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/settings.c
View File

@ -390,9 +390,23 @@ void load_settings(char *cmdline_config_path)
"Scale larger icons down to this size, set to 0 to disable"
);
// If the deprecated icon_folders option is used,
// read it and generate its usage string.
if (ini_is_set("global", "icon_folders") || cmdline_is_set("-icon_folders")) {
settings.icon_path = option_get_string(
"global",
"icon_folders", "-icon_folders", icon_path,
"folders to default icons (deprecated, please use 'icon_path' instead)"
);
fprintf(stderr, "Warning: 'icon_folders' is deprecated, please use 'icon_path' instead.\n");
}
// Read value and generate usage string for icon_path.
// If icon_path is set, override icon_folder.
// if not, but icon_folder is set, use that instead of the compile time default.
settings.icon_path = option_get_string(
"global",
"icon_path", "-icon_path", icon_path,
"icon_path", "-icon_path",
settings.icon_path ? settings.icon_path : icon_path,
"paths to default icons"
);