Don’t use a default setting for 'order'

[i3/i3status] / i3status.c

diff --git a/i3status.c b/i3status.c
index 23f0b97ea066c0e6e3300763928d3432a71934e5..ca079313cfccd57806155df2ebdf327123e531dd 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -3,7 +3,7 @@
  *
  * i3status – Generates a status line for dzen2 or xmobar
  *
- * Copyright © 2008-2009 Michael Stapelberg and contributors
+ * Copyright © 2008-2011 Michael Stapelberg and contributors
  * Copyright © 2009 Thorsten Toepper <atsutane at freethoughts dot de>
  * Copyright © 2010 Axel Wagner <mail at merovius dot de>
  * Copyright © 2010 Fernando Tarlá Cardoso Lemos <fernandotcl at gmail dot com>
@@ -224,7 +224,7 @@ int main(int argc, char *argv[]) {
         };
 
         cfg_opt_t load_opts[] = {
-                CFG_STR("format", "%5min %10min %15min", CFGF_NONE),
+                CFG_STR("format", "%1min %5min %15min", CFGF_NONE),
                 CFG_END()
         };
 
@@ -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),
@@ -291,11 +291,11 @@ int main(int argc, char *argv[]) {
                 if ((char)o == 'c')
                         configfile = optarg;
                 else if ((char)o == 'h') {
-                        printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n"
+                        printf("i3status " VERSION " © 2008-2011 Michael Stapelberg and contributors\n"
                                 "Syntax: %s [-c <configfile>] [-h] [-v]\n", argv[0]);
                         return 0;
                 } else if ((char)o == 'v') {
-                        printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n");
+                        printf("i3status " VERSION " © 2008-2011 Michael Stapelberg and contributors\n");
                         return 0;
                 }
 
@@ -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");
@@ -344,7 +347,9 @@ int main(int argc, char *argv[]) {
 
         struct tm tm;
         while (1) {
-                time_t current_time = time(NULL);
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
+                time_t current_time = tv.tv_sec;
                 struct tm *current_tm = NULL;
                 if (current_time != (time_t) -1) {
                         localtime_r(&current_time, &tm);