diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2019-01-20 13:51:12 -0500 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2019-01-20 13:51:12 -0500 |
| commit | 41c2c51f6151b6b5d86902c51d0ffb241688bd82 (patch) | |
| tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /common/pango.c | |
| parent | 6f1ef5dd2ae739878a91e19bbfaef038d6d3fa83 (diff) | |
Replace wlr_log with sway_log
This commit mostly duplicates the wlr_log functions, although
with a sway_* prefix. (This is very similar to PR #2009.)
However, the logging function no longer needs to be replaceable,
so sway_log_init's second argument is used to set the exit
callback for sway_abort.
wlr_log_init is still invoked in sway/main.c
This commit makes it easier to remove the wlroots dependency for
the helper programs swaymsg, swaybg, swaybar, and swaynag.
Diffstat (limited to 'common/pango.c')
| -rw-r--r-- | common/pango.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/pango.c b/common/pango.c index 7e164043..fc3d0688 100644 --- a/common/pango.c +++ b/common/pango.c @@ -61,7 +61,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, pango_layout_set_text(layout, buf, -1); free(buf); } else { - wlr_log(WLR_ERROR, "pango_parse_markup '%s' -> error %s", text, + sway_log(SWAY_ERROR, "pango_parse_markup '%s' -> error %s", text, error->message); g_error_free(error); markup = false; // fallback to plain text @@ -92,7 +92,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, char *buf = malloc(length); if (buf == NULL) { - wlr_log(WLR_ERROR, "Failed to allocate memory"); + sway_log(SWAY_ERROR, "Failed to allocate memory"); return; } va_start(args, fmt); @@ -119,7 +119,7 @@ void pango_printf(cairo_t *cairo, const char *font, char *buf = malloc(length); if (buf == NULL) { - wlr_log(WLR_ERROR, "Failed to allocate memory"); + sway_log(SWAY_ERROR, "Failed to allocate memory"); return; } va_start(args, fmt); |