From fc97bd7e2303f3d52c68fa17a94694c22e1b885a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 21 Aug 2025 09:56:37 +0200 Subject: [PATCH 1/2] tests: Check return value of `system` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids having the compiler complain about an unused return value. Signed-off-by: Guido Günther --- tests/pgp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pgp.c b/tests/pgp.c index 7182466b..a9eb092b 100644 --- a/tests/pgp.c +++ b/tests/pgp.c @@ -428,7 +428,7 @@ create_key_cb (GObject *object, g_assert_nonnull (fingerprint); /* We can check the newly created key */ - system ("gpg --list-keys"); + g_assert (system ("gpg --list-keys") == 0); /* Delete the key in case we run tests multiple times */ system_args = g_strdup_printf ("gpg --batch --yes --delete-secret-key %s < /dev/null > /dev/null 2>&1", fingerprint); -- GitLab From 8ebdd7c79dd08d497d89e8d10205fd43d364e041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 21 Aug 2025 09:58:12 +0200 Subject: [PATCH 2/2] application: Prefix GIT_VERSION symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids the src/version.h:3: Warning: Chatty: symbol='GIT_VERSION': Unknown namespace for symbol 'GIT_VERSION' warning Signed-off-by: Guido Günther --- src/chatty-application.c | 6 +++--- src/version.h.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chatty-application.c b/src/chatty-application.c index 96fa3ff1..9eba8df8 100644 --- a/src/chatty-application.c +++ b/src/chatty-application.c @@ -156,7 +156,7 @@ chatty_application_show_about (GSimpleAction *action, adw_show_about_dialog (GTK_WIDGET (gtk_application_get_active_window (user_data)), "application-name", _("Chats"), "application-icon", CHATTY_APP_ID, - "version", GIT_VERSION, + "version", CHATTY_GIT_VERSION, "comments", _("An SMS and XMPP messaging client"), "website", "https://gitlab.gnome.org/World/Chatty", "copyright", "© 2018–2023 Purism SPC", @@ -323,7 +323,7 @@ chatty_application_handle_local_options (GApplication *application, GVariantDict *options) { if (g_variant_dict_contains (options, "version")) { - g_print ("%s %s\n", PACKAGE_NAME, GIT_VERSION); + g_print ("%s %s\n", PACKAGE_NAME, CHATTY_GIT_VERSION); return 0; } @@ -381,7 +381,7 @@ chatty_application_startup (GApplication *application) G_APPLICATION_CLASS (chatty_application_parent_class)->startup (application); - g_info ("%s %s, git version: %s", PACKAGE_NAME, PACKAGE_VERSION, GIT_VERSION); + g_info ("%s %s, git version: %s", PACKAGE_NAME, PACKAGE_VERSION, CHATTY_GIT_VERSION); cm_init (TRUE); diff --git a/src/version.h.in b/src/version.h.in index 61f64cb1..1d3dc842 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,3 +1,3 @@ #pragma once -#define GIT_VERSION "@VCS_TAG@" +#define CHATTY_GIT_VERSION "@VCS_TAG@" -- GitLab