diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-07-16 22:12:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-16 22:12:29 -0400 |
commit | 10fc7a5b494822a944bbada33b2cb25926447d76 (patch) | |
tree | fb23163603e5ac4221d6ee27ff91dffb19e3295f | |
parent | Implement default_floating_border command and adjust CSD behaviour (diff) | |
parent | Revert "config: free include path on successful load" (diff) | |
download | sway-10fc7a5b494822a944bbada33b2cb25926447d76.tar.gz sway-10fc7a5b494822a944bbada33b2cb25926447d76.tar.zst sway-10fc7a5b494822a944bbada33b2cb25926447d76.zip |
Merge branch 'master' into default-floating-border
-rw-r--r-- | sway/config.c | 1 | ||||
-rw-r--r-- | sway/tree/view.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c index f63835bf..2c051146 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -474,7 +474,6 @@ static bool load_include_config(const char *path, const char *parent_dir, | |||
474 | list_del(config->config_chain, index); | 474 | list_del(config->config_chain, index); |
475 | return false; | 475 | return false; |
476 | } | 476 | } |
477 | free(real_path); | ||
478 | 477 | ||
479 | // restore current_config_path | 478 | // restore current_config_path |
480 | config->current_config_path = parent_config; | 479 | config->current_config_path = parent_config; |
diff --git a/sway/tree/view.c b/sway/tree/view.c index d9938130..70ab9364 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -1086,6 +1086,9 @@ bool view_is_visible(struct sway_view *view) { | |||
1086 | } | 1086 | } |
1087 | 1087 | ||
1088 | void view_set_urgent(struct sway_view *view, bool enable) { | 1088 | void view_set_urgent(struct sway_view *view, bool enable) { |
1089 | if (view_is_urgent(view) == enable) { | ||
1090 | return; | ||
1091 | } | ||
1089 | if (enable) { | 1092 | if (enable) { |
1090 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 1093 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
1091 | if (seat_get_focus(seat) == view->swayc) { | 1094 | if (seat_get_focus(seat) == view->swayc) { |