2 files changed, 13 insertions, 27 deletions

diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 8d646c2d..0fb17f1d 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,10 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include <strings.h>
-#include "sway/input/input-manager.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 #include "stringop.h"
 
 struct cmd_results *seat_cmd_attach(int argc, char **argv) {
@@ -12,19 +9,17 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
         if ((error = checkarg(argc, "attach", EXPECTED_AT_LEAST, 1))) {
                 return error;
         }
-        struct seat_config *current_seat_config =
-                config->handler_context.seat_config;
-        if (!current_seat_config) {
+        if (!config->handler_context.seat_config) {
                 return cmd_results_new(CMD_FAILURE, "attach", "No seat defined");
         }
 
-        struct seat_config *new_config = new_seat_config(current_seat_config->name);
-        struct seat_attachment_config *new_attachment = seat_attachment_config_new();
-        new_attachment->identifier = strdup(argv[0]);
-        list_add(new_config->attachments, new_attachment);
-
-        if (!config->validating) {
-                apply_seat_config(new_config);
+        struct seat_attachment_config *attachment = seat_attachment_config_new();
+        if (!attachment) {
+                return cmd_results_new(CMD_FAILURE, "attach",
+                                "Failed to allocate seat attachment config");
         }
+        attachment->identifier = strdup(argv[0]);
+        list_add(config->handler_context.seat_config->attachments, attachment);
+
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c
index a0ddf3ef..8f1ab12c 100644
--- a/sway/commands/seat/fallback.c
+++ b/sway/commands/seat/fallback.c
@@ -1,27 +1,18 @@
-#include <string.h>
-#include <strings.h>
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
 
 struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        if ((error = checkarg(argc, "fallback", EXPECTED_AT_LEAST, 1))) {
+        if ((error = checkarg(argc, "fallback", EXPECTED_EQUAL_TO, 1))) {
                 return error;
         }
-        struct seat_config *current_seat_config =
-                config->handler_context.seat_config;
-        if (!current_seat_config) {
+        if (!config->handler_context.seat_config) {
                 return cmd_results_new(CMD_FAILURE, "fallback", "No seat defined");
         }
-        struct seat_config *new_config =
-                new_seat_config(current_seat_config->name);
-                
-        new_config->fallback = parse_boolean(argv[0], false);
 
-        if (!config->validating) {
-                apply_seat_config(new_config);
-        }
+        config->handler_context.seat_config->fallback =
+                parse_boolean(argv[0], false);
+
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }