diff options
author | Simon Ser <contact@emersion.fr> | 2022-12-21 11:19:04 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2022-12-22 17:42:33 +0100 |
commit | bd7466e1b7fa7bf567effeb4fcd7ab6f218dff25 (patch) | |
tree | ee69039dd830c86e594f9163dde8df0931e10be3 /swaynag/types.c | |
parent | swaynag: fix NULL font description (diff) | |
download | sway-bd7466e1b7fa7bf567effeb4fcd7ab6f218dff25.tar.gz sway-bd7466e1b7fa7bf567effeb4fcd7ab6f218dff25.tar.zst sway-bd7466e1b7fa7bf567effeb4fcd7ab6f218dff25.zip |
swaynag: drop swaynag_type.font
It's too easy to have this go out of sync with font_description.
Diffstat (limited to 'swaynag/types.c')
-rw-r--r-- | swaynag/types.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/swaynag/types.c b/swaynag/types.c index a46aacd5..409cc668 100644 --- a/swaynag/types.c +++ b/swaynag/types.c | |||
@@ -32,9 +32,8 @@ struct swaynag_type *swaynag_type_new(const char *name) { | |||
32 | 32 | ||
33 | void swaynag_types_add_default(list_t *types) { | 33 | void swaynag_types_add_default(list_t *types) { |
34 | struct swaynag_type *type_defaults = swaynag_type_new("<defaults>"); | 34 | struct swaynag_type *type_defaults = swaynag_type_new("<defaults>"); |
35 | type_defaults->font = strdup("pango:Monospace 10"); | ||
36 | type_defaults->font_description = | 35 | type_defaults->font_description = |
37 | pango_font_description_from_string(type_defaults->font); | 36 | pango_font_description_from_string("pango:Monospace 10"); |
38 | type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | 37 | type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
39 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | 38 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
40 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; | 39 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; |
@@ -92,10 +91,6 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { | |||
92 | return; | 91 | return; |
93 | } | 92 | } |
94 | 93 | ||
95 | if (src->font) { | ||
96 | dest->font = strdup(src->font); | ||
97 | } | ||
98 | |||
99 | if (src->font_description) { | 94 | if (src->font_description) { |
100 | dest->font_description = pango_font_description_copy(src->font_description); | 95 | dest->font_description = pango_font_description_copy(src->font_description); |
101 | } | 96 | } |
@@ -178,7 +173,6 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { | |||
178 | 173 | ||
179 | void swaynag_type_free(struct swaynag_type *type) { | 174 | void swaynag_type_free(struct swaynag_type *type) { |
180 | free(type->name); | 175 | free(type->name); |
181 | free(type->font); | ||
182 | pango_font_description_free(type->font_description); | 176 | pango_font_description_free(type->font_description); |
183 | free(type->output); | 177 | free(type->output); |
184 | free(type); | 178 | free(type); |