Merge branch 'master' into next

[i3/i3] / src / window.c

diff --git a/src/window.c b/src/window.c
index 17f2d4a20dc129c64f9b901e62c4bb581acb698d..270314eabb6cdca2a5d00a1809ee5323a09b5365 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -68,7 +68,7 @@ void window_update_name(i3Window *win, xcb_get_property_reply_t *prop, bool befo
         return;
     }
     /* Convert it to UCS-2 here for not having to convert it later every time we want to pass it to X */
-    int len;
+    size_t len;
     xcb_char2b_t *ucs2_name = convert_utf8_to_ucs2(new_name, &len);
     if (ucs2_name == NULL) {
         LOG("Could not convert _NET_WM_NAME to UCS-2, ignoring new hint\n");