diff options
author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /common/pango.c | |
parent | Log libinput_config_status errors (diff) | |
download | sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip |
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, | |||
61 | pango_layout_set_text(layout, buf, -1); | 61 | pango_layout_set_text(layout, buf, -1); |
62 | free(buf); | 62 | free(buf); |
63 | } else { | 63 | } else { |
64 | wlr_log(WLR_ERROR, "pango_parse_markup '%s' -> error %s", text, | 64 | sway_log(SWAY_ERROR, "pango_parse_markup '%s' -> error %s", text, |
65 | error->message); | 65 | error->message); |
66 | g_error_free(error); | 66 | g_error_free(error); |
67 | markup = false; // fallback to plain text | 67 | markup = false; // fallback to plain text |
@@ -92,7 +92,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, | |||
92 | 92 | ||
93 | char *buf = malloc(length); | 93 | char *buf = malloc(length); |
94 | if (buf == NULL) { | 94 | if (buf == NULL) { |
95 | wlr_log(WLR_ERROR, "Failed to allocate memory"); | 95 | sway_log(SWAY_ERROR, "Failed to allocate memory"); |
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | va_start(args, fmt); | 98 | va_start(args, fmt); |
@@ -119,7 +119,7 @@ void pango_printf(cairo_t *cairo, const char *font, | |||
119 | 119 | ||
120 | char *buf = malloc(length); | 120 | char *buf = malloc(length); |
121 | if (buf == NULL) { | 121 | if (buf == NULL) { |
122 | wlr_log(WLR_ERROR, "Failed to allocate memory"); | 122 | sway_log(SWAY_ERROR, "Failed to allocate memory"); |
123 | return; | 123 | return; |
124 | } | 124 | } |
125 | va_start(args, fmt); | 125 | va_start(args, fmt); |