diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-07-09 16:28:37 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-09 16:28:37 -0700 |
| commit | 6fd9a2bfd6f7d56dc8ed9fc40d80844cc84df107 (patch) | |
| tree | 7d89592bcfb1adc10ded38d2f8d09d134ddd34fe /common/util.c | |
| parent | Document `focus floating|tiling` (diff) | |
| parent | Merge pull request #2234 from emersion/wlr-log-prefix (diff) | |
| download | sway-6fd9a2bfd6f7d56dc8ed9fc40d80844cc84df107.tar.gz sway-6fd9a2bfd6f7d56dc8ed9fc40d80844cc84df107.tar.zst sway-6fd9a2bfd6f7d56dc8ed9fc40d80844cc84df107.zip | |
Merge branch 'master' into focus-mode-toggle
Diffstat (limited to 'common/util.c')
| -rw-r--r-- | common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/util.c b/common/util.c index 678926ed..e8a88772 100644 --- a/common/util.c +++ b/common/util.c | |||
| @@ -113,7 +113,7 @@ uint32_t parse_color(const char *color) { | |||
| 113 | 113 | ||
| 114 | int len = strlen(color); | 114 | int len = strlen(color); |
| 115 | if (len != 6 && len != 8) { | 115 | if (len != 6 && len != 8) { |
| 116 | wlr_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); | 116 | wlr_log(WLR_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); |
| 117 | return 0xFFFFFFFF; | 117 | return 0xFFFFFFFF; |
| 118 | } | 118 | } |
| 119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); | 119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); |