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

replace 'folder' with 'path' in icon functionality

Browse Source 
"folder" is more of a windows term. In unix we have paths and
directories.
This commit is contained in:
George Angelopoulos 2017-07-29 15:16:08 +02:00
parent 7104c42151
commit 4d03acc454
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -56,7 +56,7 @@ char *browser = "/usr/bin/firefox";
int max_icon_size = 0; int max_icon_size = 0;
/* paths to default icons */ /* paths to default icons */
char *icon_folders = "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/"; char *icon_path = "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/";
/* follow focus to different monitor and display notifications there? /* follow focus to different monitor and display notifications there?
* possible values: * possible values:

2
docs/dunst.pod
View File

@ -383,7 +383,7 @@ Set to 0 to disable icon scaling. (default)
If B<icon_position> is set to off, this setting is ignored. If B<icon_position> is set to off, this setting is ignored.
=item B<icon_folders> (default: "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/") =item B<icon_path> (default: "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
Can be set to a colon-separated list of paths to search for icons to use with Can be set to a colon-separated list of paths to search for icons to use with
notifications. notifications.

2
dunstrc
View File

@ -159,7 +159,7 @@
max_icon_size = 32 max_icon_size = 32
# Paths to default icons. # Paths to default icons.
icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
### History ### ### History ###

4
src/settings.c
View File

@ -390,9 +390,9 @@ void load_settings(char *cmdline_config_path)
"Scale larger icons down to this size, set to 0 to disable" "Scale larger icons down to this size, set to 0 to disable"
); );
settings.icon_folders = option_get_string( settings.icon_path = option_get_string(
"global", "global",
"icon_folders", "-icon_folders", icon_folders, "icon_path", "-icon_path", icon_path,
"paths to default icons" "paths to default icons"
); );

2
src/settings.h
View File

@ -63,7 +63,7 @@ typedef struct _settings {
char *browser; char *browser;
enum icon_position_t icon_position; enum icon_position_t icon_position;
int max_icon_size; int max_icon_size;
char *icon_folders; char *icon_path;
enum follow_mode f_mode; enum follow_mode f_mode;
bool always_run_script; bool always_run_script;
keyboard_shortcut close_ks; keyboard_shortcut close_ks;

6
src/x11/x.c
View File

@ -329,13 +329,13 @@ static GdkPixbuf *get_pixbuf_from_path(char *icon_path)
if (icon_path[0] == '/' || icon_path[0] == '~') { if (icon_path[0] == '/' || icon_path[0] == '~') {
pixbuf = get_pixbuf_from_file(icon_path); pixbuf = get_pixbuf_from_file(icon_path);
} }
/* search in icon_folders */ /* search in icon_path */
if (pixbuf == NULL) { if (pixbuf == NULL) {
char *start = settings.icon_folders, char *start = settings.icon_path,
*end, *current_folder, *maybe_icon_path; *end, *current_folder, *maybe_icon_path;
do { do {
end = strchr(start, ':'); end = strchr(start, ':');
if (end == NULL) end = strchr(settings.icon_folders, '\0'); /* end = end of string */ if (end == NULL) end = strchr(settings.icon_path, '\0'); /* end = end of string */
current_folder = g_strndup(start, end - start); current_folder = g_strndup(start, end - start);
/* try svg */ /* try svg */