summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-10-20 09:47:49 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-10-25 17:49:49 -0400
commit66c2a0f70e5658d7cc47f8973b11a0041f3488e0 (patch)
tree4098000127658f40622e250dfc6d2b2f45f6ab92
parentMerge pull request #947 from alkino/fix_move_empty_workspace (diff)
downloadsway-66c2a0f70e5658d7cc47f8973b11a0041f3488e0.tar.gz
sway-66c2a0f70e5658d7cc47f8973b11a0041f3488e0.tar.zst
sway-66c2a0f70e5658d7cc47f8973b11a0041f3488e0.zip
Merge pull request #958 from Hummer12007/pango0.10
config: set pango_markup default to false
-rw-r--r--sway/config.c2
-rw-r--r--swaybar/config.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c
index c0fbd210..1c460d31 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -1115,7 +1115,7 @@ struct bar_config *default_bar_config(void) {
1115 bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; 1115 bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
1116 bar->bindings = create_list(); 1116 bar->bindings = create_list();
1117 bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); 1117 bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done");
1118 bar->pango_markup = true; 1118 bar->pango_markup = false;
1119 bar->swaybar_command = NULL; 1119 bar->swaybar_command = NULL;
1120 bar->font = NULL; 1120 bar->font = NULL;
1121 bar->height = -1; 1121 bar->height = -1;
diff --git a/swaybar/config.c b/swaybar/config.c
index c5437ee7..7959b1ca 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -33,7 +33,7 @@ char *parse_font(const char *font) {
33struct config *init_config() { 33struct config *init_config() {
34 struct config *config = calloc(1, sizeof(struct config)); 34 struct config *config = calloc(1, sizeof(struct config));
35 config->status_command = NULL; 35 config->status_command = NULL;
36 config->pango_markup = true; 36 config->pango_markup = false;
37 config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; 37 config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
38 config->font = strdup("monospace 10"); 38 config->font = strdup("monospace 10");
39 config->mode = NULL; 39 config->mode = NULL;