summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar taiyu <taiyu.len@gmail.com>2015-09-08 10:28:53 -0700
committerLibravatar taiyu <taiyu.len@gmail.com>2015-09-08 10:28:53 -0700
commit799ff640f8c15dde5f8d65fdd71f91bab7aaa5fe (patch)
tree67d6d26a3028fe43ed6508a58a23d0c2caa9a539
parentvar replacement changes (diff)
downloadsway-799ff640f8c15dde5f8d65fdd71f91bab7aaa5fe.tar.gz
sway-799ff640f8c15dde5f8d65fdd71f91bab7aaa5fe.tar.zst
sway-799ff640f8c15dde5f8d65fdd71f91bab7aaa5fe.zip
remove old things
-rw-r--r--sway/commands.c2
-rw-r--r--sway/config.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/sway/commands.c b/sway/commands.c
index edc56466..423b576f 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1050,7 +1050,7 @@ static int handler_compare(const void *_a, const void *_b) {
1050 return strcasecmp(a->command, b->command); 1050 return strcasecmp(a->command, b->command);
1051} 1051}
1052 1052
1053struct cmd_handler *find_handler(char *line) { 1053static struct cmd_handler *find_handler(char *line) {
1054 struct cmd_handler d = { .command=line }; 1054 struct cmd_handler d = { .command=line };
1055 struct cmd_handler *res = bsearch(&d, handlers, 1055 struct cmd_handler *res = bsearch(&d, handlers,
1056 sizeof(handlers) / sizeof(struct cmd_handler), 1056 sizeof(handlers) / sizeof(struct cmd_handler),
diff --git a/sway/config.c b/sway/config.c
index 7d3104c7..11394a7c 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -214,12 +214,9 @@ bool load_config(const char *file) {
214 214
215bool read_config(FILE *file, bool is_active) { 215bool read_config(FILE *file, bool is_active) {
216 struct sway_config *old_config = config; 216 struct sway_config *old_config = config;
217 struct sway_mode *default_mode;
218 config = malloc(sizeof(struct sway_config)); 217 config = malloc(sizeof(struct sway_config));
219 218
220 config_defaults(config); 219 config_defaults(config);
221 default_mode = config->current_mode;
222
223 if (is_active) { 220 if (is_active) {
224 sway_log(L_DEBUG, "Performing configuration file reload"); 221 sway_log(L_DEBUG, "Performing configuration file reload");
225 config->reloading = true; 222 config->reloading = true;