From f28fa5aefdafa5dba6c8f76ae7a675fdc4fe2af2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 21 Dec 2018 09:55:59 -0500 Subject: [PATCH] Fix remote-ls ellipsizing We were inadvertedly adding extra columns when trying to set existing columns as ellipsizable. Oops. Closes: #2460 Approved by: alexlarsson --- app/flatpak-builtins-remote-ls.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c index 0b0c5184..b53a4804 100644 --- a/app/flatpak-builtins-remote-ls.c +++ b/app/flatpak-builtins-remote-ls.c @@ -123,16 +123,15 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime, flatpak_table_printer_set_column_titles (printer, columns); for (i = 0; columns[i].name; i++) - flatpak_table_printer_set_column_expand (printer, i, TRUE); - flatpak_table_printer_set_column_ellipsize (printer, - find_column (columns, "description", NULL), - FLATPAK_ELLIPSIZE_MODE_END); - flatpak_table_printer_set_column_ellipsize (printer, - find_column (columns, "application", NULL), - FLATPAK_ELLIPSIZE_MODE_END); - flatpak_table_printer_set_column_ellipsize (printer, - find_column (columns, "options", NULL), - FLATPAK_ELLIPSIZE_MODE_END); + { + flatpak_table_printer_set_column_expand (printer, i, TRUE); + if (strcmp (columns[i].name, "description") == 0) + flatpak_table_printer_set_column_ellipsize (printer, i, FLATPAK_ELLIPSIZE_MODE_END); + if (strcmp (columns[i].name, "application") == 0) + flatpak_table_printer_set_column_ellipsize (printer, i, FLATPAK_ELLIPSIZE_MODE_START); + if (strcmp (columns[i].name, "options") == 0) + flatpak_table_printer_set_column_ellipsize (printer, i, FLATPAK_ELLIPSIZE_MODE_START); + } if (app_runtime) {