Merge branch 'wlroots'

1 files changed, 11 insertions, 2 deletions

diff --git a/sway/commands/set.c b/sway/commands/set.c
index 46fc6d38..84e9b792 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -5,6 +5,7 @@
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "list.h"
+#include "log.h"
 #include "stringop.h"
 
 // sort in order of longest->shortest
@@ -14,16 +15,24 @@ static int compare_set_qsort(const void *_l, const void *_r) {
 	return strlen(r->name) - strlen(l->name);
 }
 
+void free_sway_variable(struct sway_variable *var) {
+	if (!var) {
+		return;
+	}
+	free(var->name);
+	free(var->value);
+	free(var);
+}
+
 struct cmd_results *cmd_set(int argc, char **argv) {
 	char *tmp;
 	struct cmd_results *error = NULL;
-	if (!config->reading) return cmd_results_new(CMD_FAILURE, "set", "Can only be used in config file.");
 	if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) {
 		return error;
 	}
 
 	if (argv[0][0] != '$') {
-		sway_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
+		wlr_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
 
 		size_t size = snprintf(NULL, 0, "$%s", argv[0]);
 		tmp = malloc(size + 1);