From 73d5a02bfc02a0b2bbb9da9ea10a0d7ff59c9300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 5 Mar 2025 11:13:51 +0100 Subject: [PATCH] libfeedback: Make libfeedback.h only include other files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the init functions to their own header so we don't clutter libfeedback.h more in the future. Signed-off-by: Guido Günther --- libfeedback/{libfeedback.c => lfb-main.c} | 5 ++++- libfeedback/lfb-main.h | 27 +++++++++++++++++++++++ libfeedback/libfeedback.h | 11 ++------- libfeedback/meson.build | 3 ++- 4 files changed, 35 insertions(+), 11 deletions(-) rename libfeedback/{libfeedback.c => lfb-main.c} (98%) create mode 100644 libfeedback/lfb-main.h diff --git a/libfeedback/libfeedback.c b/libfeedback/lfb-main.c similarity index 98% rename from libfeedback/libfeedback.c rename to libfeedback/lfb-main.c index b984846..b317305 100644 --- a/libfeedback/libfeedback.c +++ b/libfeedback/lfb-main.c @@ -1,9 +1,12 @@ /* * Copyright (C) 2020 Purism SPC + * 2025 The Phosh Developers + * * SPDX-License-Identifier: LGPL-2.1+ + * * Author: Guido Günther */ -#include "libfeedback.h" +#include "lfb-main.h" #include "lfb-gdbus.h" #include "lfb-priv.h" diff --git a/libfeedback/lfb-main.h b/libfeedback/lfb-main.h new file mode 100644 index 0000000..3716b30 --- /dev/null +++ b/libfeedback/lfb-main.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2025 The Phosh Developers + * + * SPDX-License-Identifier: LGPL-2.1+ + */ +#pragma once + +#include "lfb-gdbus.h" + +#include + +#if !defined (__LIBFEEDBACK_H_INSIDE__) && !defined (LIBFEEDBACK_COMPILATION) +#error "Only can be included directly." +#endif + +G_BEGIN_DECLS + +gboolean lfb_init (const gchar *app_id, GError **error); +void lfb_uninit (void); +void lfb_set_app_id (const char *app_id); +const char *lfb_get_app_id (void); +gboolean lfb_is_initted (void); +void lfb_set_feedback_profile (const char *profile); +const char *lfb_get_feedback_profile (void); +LfbGdbusFeedback *lfb_get_proxy (void); + +G_END_DECLS diff --git a/libfeedback/libfeedback.h b/libfeedback/libfeedback.h index 15a0591..8bc07e2 100644 --- a/libfeedback/libfeedback.h +++ b/libfeedback/libfeedback.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2020 Purism SPC + * 2025 The Phosh Developers * * SPDX-License-Identifier: LGPL-2.1+ */ @@ -18,14 +19,6 @@ G_BEGIN_DECLS #include "lfb-enums.h" #include "lfb-event.h" #include "lfb-gdbus.h" - -gboolean lfb_init (const gchar *app_id, GError **error); -void lfb_uninit (void); -void lfb_set_app_id (const char *app_id); -const char *lfb_get_app_id (void); -gboolean lfb_is_initted (void); -void lfb_set_feedback_profile (const char *profile); -const char *lfb_get_feedback_profile (void); -LfbGdbusFeedback *lfb_get_proxy (void); +#include "lfb-main.h" G_END_DECLS diff --git a/libfeedback/meson.build b/libfeedback/meson.build index 27d94c6..fe74891 100644 --- a/libfeedback/meson.build +++ b/libfeedback/meson.build @@ -23,14 +23,15 @@ lfb_enum_sources = gnome.mkenums_simple('lfb-enums', libfeedback_headers = [ 'libfeedback.h', 'lfb-event.h', + 'lfb-main.h', ] libfeedback_sources = [ generated_dbus_sources, lfb_enum_sources, libfeedback_headers, - 'libfeedback.c', 'lfb-event.c', + 'lfb-main.c', ] libfeedback_deps = [