From c08c805ecd8f2000a35cdeae7b16244d0b3c0528 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Thu, 14 Dec 2017 01:30:54 +0100
Subject: Adaptions for API change in json-c v0.13

Lift restriction on json-c <= 0.12.1

ipc-server: Acquire ownership of referenced json_object properly

When adding a referenced json_object with an unknown lifetime to
another json_object, it must be done with a wrapped call to
json_object_get() to acquire the ownership of that json_object.
---
 swaylock/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'swaylock')

diff --git a/swaylock/main.c b/swaylock/main.c
index 4b486461..3208a45b 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -3,7 +3,6 @@
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-names.h>
 #include <security/pam_appl.h>
-#include <json-c/json.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,6 +13,7 @@
 #include <signal.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include "sway_json_helper.h"
 #include "client/window.h"
 #include "client/registry.h"
 #include "client/cairo.h"
@@ -583,7 +583,7 @@ int main(int argc, char **argv) {
 
 		for (i = 0; i < registry->outputs->length; ++i) {
 			if (displays_paths[i * 2] != NULL) {
-				for (int j = 0;; ++j) {
+				for (json_ar_len_t j = 0;; ++j) {
 					if (j >= json_object_array_length(json_outputs)) {
 						sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]);
 						exit(EXIT_FAILURE);
-- 
cgit v1.2.3-70-g09d2