diff options
| -rw-r--r-- | config/config.c | 2 | ||||
| -rw-r--r-- | doc/rofi.1.markdown | 4 | ||||
| -rw-r--r-- | doc/test_xr.txt | 2 | ||||
| -rw-r--r-- | include/settings.h | 2 | ||||
| -rw-r--r-- | source/rofi-icon-fetcher.c | 2 | ||||
| -rw-r--r-- | source/xrmoptions.c | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/config/config.c b/config/config.c index d1503c4d..56845381 100644 --- a/config/config.c +++ b/config/config.c @@ -68,7 +68,7 @@ Settings config = { /** Command executed on accep-entry-custom for window modus */ .window_command = "xkill -id {window}", /** No default icon theme, we search Adwaita and gnome as fallback */ - .drun_icon_theme = NULL, + .icon_theme = NULL, /** * Location of the window. * Enumeration indicating location or gravity of window. diff --git a/doc/rofi.1.markdown b/doc/rofi.1.markdown index 0e9df72e..b1a1984b 100644 --- a/doc/rofi.1.markdown +++ b/doc/rofi.1.markdown @@ -199,9 +199,9 @@ Specify the directory where **rofi** should look for plugins. Show application icons in drun and window modes. -`-drun-icon-theme` +`-icon-theme` -Specify icon theme to be used in drun mode if show-icons setting is enabled. +Specify icon theme to be used. If not specified default theme from DE is used, *Adwaita* and *gnome* themes act as fallback themes. diff --git a/doc/test_xr.txt b/doc/test_xr.txt index 4998d931..5f411769 100644 --- a/doc/test_xr.txt +++ b/doc/test_xr.txt @@ -39,7 +39,7 @@ rofi.window-command: xkill -id {window} ! "Window fields to match in window mode" Set from: Default ! rofi.window-match-fields: all ! "Theme to use to look for icons" Set from: Default -! rofi.drun-icon-theme: +! rofi.icon-theme: ! "Desktop entry fields to match in drun" Set from: Default ! rofi.drun-match-fields: name,generic,exec,categories ! "Disable history in run/ssh" Set from: File diff --git a/include/settings.h b/include/settings.h index 6361b969..66729597 100644 --- a/include/settings.h +++ b/include/settings.h @@ -88,7 +88,7 @@ typedef struct /** Window fields to match in window mode */ char * window_match_fields; /** Theme for icons */ - char * drun_icon_theme; + char * icon_theme; /** Windows location/gravity */ WindowLocation location; diff --git a/source/rofi-icon-fetcher.c b/source/rofi-icon-fetcher.c index 1c0dc6ca..f1038eca 100644 --- a/source/rofi-icon-fetcher.c +++ b/source/rofi-icon-fetcher.c @@ -30,6 +30,7 @@ #include "rofi-icon-fetcher.h" #include "rofi-types.h" #include "helper.h" +#include "settings.h" typedef struct { @@ -131,6 +132,7 @@ static void rofi_icon_fetcher_worker ( thread_state *sdata, G_GNUC_UNUSED gpoint // this should be fine running in another thread. IconFetcherEntry *sentry = (IconFetcherEntry*) sdata; const gchar *themes[1] = { + config.icon_theme, NULL }; diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 36c296be..e66c78d9 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -130,7 +130,7 @@ static XrmOption xrmOptions[] = { "Command executed on accep-entry-custom for window modus", CONFIG_DEFAULT }, { xrm_String, "window-match-fields", { .str = &config.window_match_fields }, NULL, "Window fields to match in window mode", CONFIG_DEFAULT }, - { xrm_String, "drun-icon-theme", { .str = &config.drun_icon_theme }, NULL, + { xrm_String, "icon-theme", { .str = &config.icon_theme }, NULL, "Theme to use to look for icons", CONFIG_DEFAULT }, { xrm_String, "drun-match-fields", { .str = &config.drun_match_fields }, NULL, |