From 33cd95e61dcb5947e7671a8eb21d67014376495e Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 16 Jun 2021 22:54:43 +0200 Subject: Skip elipsizing if max characters are 0 - data/org.ayatana.common.gschema.xml.in: Set min value to 0 + update description - src/utils.c: Include hadling max allowed length of 0 - tests/CMakeLists.txt: Compile schema locally for testing - tests/tst_utils.cpp: Include handling max allowed length of 0 - po/ayatana-common.pot: Update translation strings - po/*.po: Update translation strings fixes https://github.com/AyatanaIndicators/libayatana-common/issues/29 --- src/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/utils.c b/src/utils.c index 1d21b02..0237461 100644 --- a/src/utils.c +++ b/src/utils.c @@ -293,7 +293,7 @@ void ayatana_common_utils_elipsize(char *sText) } } - if (nLetters > nMaxLetters + 4) + if (nMaxLetters > 0 && nLetters > nMaxLetters + 4) { gchar *pLastChar = g_utf8_offset_to_pointer(sText, nMaxLetters); memcpy(pLastChar, "...\0", 4); -- cgit v1.2.3 From 07a34255244a71f6b92a9861dd9571742cd1762b Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 21 Jun 2021 02:48:40 +0200 Subject: Rename ayatana_common_utils_elipsize to ayatana_common_utils_ellipsize --- src/utils.c | 2 +- src/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/utils.c b/src/utils.c index 0237461..0faaca2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -274,7 +274,7 @@ ayatana_common_utils_zenity_warning (const char * icon_name, return confirmed; } -void ayatana_common_utils_elipsize(char *sText) +void ayatana_common_utils_ellipsize(char *sText) { guint nMaxLetters = 50; glong nLetters = g_utf8_strlen(sText, -1); diff --git a/src/utils.h b/src/utils.h index 13e2d2f..3098146 100644 --- a/src/utils.h +++ b/src/utils.h @@ -50,4 +50,4 @@ gboolean ayatana_common_utils_open_url(const gchar * url); gboolean ayatana_common_utils_have_program(const gchar * program); gboolean ayatana_common_utils_zenity_warning(const char *icon_name, const char *title, const char *text); -void ayatana_common_utils_elipsize(char *sText); +void ayatana_common_utils_ellipsize(char *sText); -- cgit v1.2.3