diff options
author | Franklin "Snaipe" Mathieu <snaipe@diacritic.io> | 2018-10-27 18:29:56 +0100 |
---|---|---|
committer | Franklin "Snaipe" Mathieu <snaipe@diacritic.io> | 2018-10-27 18:39:17 +0100 |
commit | 259fe1e76f752a842dc495bcc9862119a1e0b378 (patch) | |
tree | 582298e3a57821824dc3c895906c94850426ba15 /sway/ipc-json.c | |
parent | sway-ipc: don't log errno if unneeded and add more descriptive errors (diff) | |
download | sway-259fe1e76f752a842dc495bcc9862119a1e0b378.tar.gz sway-259fe1e76f752a842dc495bcc9862119a1e0b378.tar.zst sway-259fe1e76f752a842dc495bcc9862119a1e0b378.zip |
ipc: remove class key from view json
It turns out that i3 does not have a `class` key in the json description
of a view, but provides it through `window_properties.class`. Since
`window_properties` has been added by 8fc9328, we can remove `class`
altogether.
Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r-- | sway/ipc-json.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 2cd0cb2d..5d1393bc 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -229,10 +229,6 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object | |||
229 | json_object_object_add(object, "app_id", | 229 | json_object_object_add(object, "app_id", |
230 | app_id ? json_object_new_string(app_id) : NULL); | 230 | app_id ? json_object_new_string(app_id) : NULL); |
231 | 231 | ||
232 | const char *class = view_get_class(c->view); | ||
233 | json_object_object_add(object, "class", | ||
234 | class ? json_object_new_string(class) : NULL); | ||
235 | |||
236 | json_object *marks = json_object_new_array(); | 232 | json_object *marks = json_object_new_array(); |
237 | list_t *view_marks = c->view->marks; | 233 | list_t *view_marks = c->view->marks; |
238 | for (int i = 0; i < view_marks->length; ++i) { | 234 | for (int i = 0; i < view_marks->length; ++i) { |
@@ -269,6 +265,7 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object | |||
269 | 265 | ||
270 | json_object *window_props = json_object_new_object(); | 266 | json_object *window_props = json_object_new_object(); |
271 | 267 | ||
268 | const char *class = view_get_class(c->view); | ||
272 | json_object_object_add(window_props, "class", | 269 | json_object_object_add(window_props, "class", |
273 | class ? json_object_new_string(class) : NULL); | 270 | class ? json_object_new_string(class) : NULL); |
274 | const char *instance = view_get_instance(c->view); | 271 | const char *instance = view_get_instance(c->view); |