Increase backwards compat for border_margin.
authorBrenden Matthews <brenden@rty.ca>
Sun, 14 Jun 2009 18:24:18 +0000 (12:24 -0600)
committerBrenden Matthews <brenden@rty.ca>
Sun, 14 Jun 2009 18:24:18 +0000 (12:24 -0600)
Even though border_margin is deprecated, we'll set border_inner_margin
anyway so lazy people won't complain too much.

src/conky.c

index be778e4..ed24d92 100644 (file)
@@ -7913,6 +7913,12 @@ static void load_config_file(const char *f)
                }
                CONF("border_margin") {
                        ERR("border_margin is deprecated, please use border_inner_margin instead");
+                       if (value) {
+                               border_inner_margin = strtol(value, 0, 0);
+                               if (border_inner_margin < 0) border_inner_margin = 0;
+                       } else {
+                               CONF_ERR;
+                       }
                }
                CONF("border_inner_margin") {
                        if (value) {