Merge branch 'master' into next

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 740278aecd12eb4bae72c0848d5ec25c474bf28d..40fffbfc4cebf8c71d2a4d18f38003968083357f 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -119,7 +119,6 @@ struct deco_render_params {
     Rect con_deco_rect;
     uint32_t background;
     bool con_is_leaf;
-    xcb_font_t font;
 };
 
 /**
@@ -285,7 +284,7 @@ struct Window {
     char *name_json;
 
     /** The length of the name in glyphs (not bytes) */
-    int name_len;
+    size_t name_len;
 
     /** Whether the application used _NET_WM_NAME */
     bool uses_net_wm_name;