From 96e81d1b56b1bbc61be8ee720937dd0f0abfd4ad Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@blame.services>
Date: Thu, 17 Nov 2022 17:49:16 +0100
Subject: [PATCH 1/2] Disable imdkit by default

---
 configure.ac      | 4 ++--
 meson_options.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a84c8a36..908b2f80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,9 +148,9 @@ AC_DEFINE_UNQUOTED([GLIB_VERSION_MAX_ALLOWED], [(G_ENCODE_VERSION(${glib_min_maj
 GW_CHECK_XCB([xcb-aux xcb-xkb xkbcommon xkbcommon-x11 xcb-ewmh xcb-icccm xcb-cursor xcb-randr xcb-xinerama ])
 
 
-AC_ARG_ENABLE([imdkit], AS_HELP_STRING([--disable-imdkit], [Build with checks using check library (default: enabled)]))
+AC_ARG_ENABLE([imdkit], AS_HELP_STRING([--enable-imdkit], [Build with checks using check library (default: disabled)]))
 
-AS_IF([test "x${enable_imdkit}" != "xno"], [
+AS_IF([test "x${enable_imdkit}" = "xyes"], [
 PKG_CHECK_MODULES([imdclient], [xcb-imdkit <= 1.0.2 ],
                   [AC_DEFINE([XCB_IMDKIT_1_0_3_LOWER], [1], [Indicate lower version of imdclient])
                   AC_DEFINE([XCB_IMDKIT],[1], [IMD Kit missing])],
diff --git a/meson_options.txt b/meson_options.txt
index 9ca68fc6..519ea3cc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
 option('drun', type: 'boolean', value: true, description: 'Desktop file mode')
 option('window', type: 'boolean', value: true, description: 'Window switcher mode')
 option('check', type: 'feature', description: 'Build and run libcheck-based tests')
-option('imdkit', type: 'boolean', value: true, description: 'IMDKit support')
+option('imdkit', type: 'boolean', value: false, description: 'IMDKit support')

From c6ba962673df73ecac1dfd3b84afb36b06c38eb4 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Fri, 18 Nov 2022 08:46:16 +0100
Subject: [PATCH 2/2] [listview] Set ellipsize mode on creation of textbox

So if rows are added, they behave correctily.

Issue: #1746
---
 source/widgets/listview.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/widgets/listview.c b/source/widgets/listview.c
index 52146702..fe2cb496 100644
--- a/source/widgets/listview.c
+++ b/source/widgets/listview.c
@@ -175,6 +175,7 @@ static void listview_add_widget(listview *lv, _listview_row *row, widget *wid,
     row->textbox =
         textbox_create(WIDGET(wid), WIDGET_TYPE_TEXTBOX_TEXT, "element-text",
                        TB_AUTOHEIGHT | flags, NORMAL, "DDD", 0, 0);
+    textbox_set_ellipsize(row->textbox, lv->emode);
     box_add((box *)wid, WIDGET(row->textbox), TRUE);
   } else if (strcasecmp(label, "element-index") == 0) {
     row->index =