From 692f0124a34625f3296d97496b721973e1f951a2 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 10 Oct 2011 20:29:44 +0100 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20use=20a=20default=20setting=20fo?= =?utf8?q?r=20'order'?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This will make i3status depend on a useful configuration file (so /etc/i3status.conf has to be installed) to actually output anything. However, it fixes a very common error: people edit their i3status.conf and don’t get that the first order directive has to use =, not +=. Since order is now empty by default, you can use += everywhere. --- i3status.c | 5 ++++- i3status.conf | 2 +- man/i3status.man | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/i3status.c b/i3status.c index a02360b..ca07931 100644 --- a/i3status.c +++ b/i3status.c @@ -253,7 +253,7 @@ int main(int argc, char *argv[]) { }; cfg_opt_t opts[] = { - CFG_STR_LIST("order", "{ipv6,\"run_watch DHCP\",\"wireless wlan0\",\"ethernet eth0\",\"battery 0\",\"cpu_temperature 0\",load,time}", CFGF_NONE), + CFG_STR_LIST("order", "{}", CFGF_NONE), CFG_SEC("general", general_opts, CFGF_NONE), CFG_SEC("run_watch", run_watch_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC("wireless", wireless_opts, CFGF_TITLE | CFGF_MULTI), @@ -307,6 +307,9 @@ int main(int argc, char *argv[]) { if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR) return EXIT_FAILURE; + if (cfg_size(cfg, "order") == 0) + die("Your 'order' array is empty. Please fix your config.\n"); + cfg_general = cfg_getsec(cfg, "general"); if (cfg_general == NULL) die("Could not get section \"general\"\n"); diff --git a/i3status.conf b/i3status.conf index 2c90a27..ee0db5c 100644 --- a/i3status.conf +++ b/i3status.conf @@ -3,7 +3,7 @@ general { interval = 5 } -order = "ipv6" +order += "ipv6" order += "disk /" order += "run_watch DHCP" order += "run_watch VPN" diff --git a/man/i3status.man b/man/i3status.man index f9bcebf..b1564ff 100644 --- a/man/i3status.man +++ b/man/i3status.man @@ -51,7 +51,7 @@ general { interval = 5 } -order = "ipv6" +order += "ipv6" order += "disk /" order += "run_watch DHCP" order += "run_watch VPN" -- 2.39.5