Merge branch 'wlroots' into split-containers

1 files changed, 10 insertions, 10 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 90012c6d..8156a08e 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -72,23 +72,23 @@ void apply_input_config(struct input_config *input) {
                 list_add(config->input_configs, input);
         }
 
-        sway_input_manager_apply_input_config(input_manager, input);
+        input_manager_apply_input_config(input_manager, input);
 }
 
-void apply_seat_config(struct seat_config *seat) {
+void apply_seat_config(struct seat_config *seat_config) {
         int i;
-        i = list_seq_find(config->seat_configs, seat_name_cmp, seat->name);
+        i = list_seq_find(config->seat_configs, seat_name_cmp, seat_config->name);
         if (i >= 0) {
                 // merge existing config
                 struct seat_config *sc = config->seat_configs->items[i];
-                merge_seat_config(sc, seat);
-                free_seat_config(seat);
-                seat = sc;
+                merge_seat_config(sc, seat_config);
+                free_seat_config(seat_config);
+                seat_config = sc;
         } else {
-                list_add(config->seat_configs, seat);
+                list_add(config->seat_configs, seat_config);
         }
 
-        sway_input_manager_apply_seat_config(input_manager, seat);
+        input_manager_apply_seat_config(input_manager, seat_config);
 }
 
 /* Keep alphabetized */
@@ -267,7 +267,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
 
         if (seat == NULL) {
                 // passing a NULL seat means we just pick the default seat
-                seat = sway_input_manager_get_default_seat(input_manager);
+                seat = input_manager_get_default_seat(input_manager);
                 if (!sway_assert(seat, "could not find a seat to run the command on")) {
                         return NULL;
                 }
@@ -345,7 +345,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
                                 // without criteria, the command acts upon the focused
                                 // container
                                 config->handler_context.current_container =
-                                        sway_seat_get_focus_inactive(seat, &root_container);
+                                        seat_get_focus_inactive(seat, &root_container);
                                 if (!sway_assert(config->handler_context.current_container,
                                                 "could not get focus-inactive for root container")) {
                                         return NULL;