From a0cf6bb068b35c44338bfa41cd176c83fd330a56 Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Sun, 12 Jan 2025 20:49:05 +0900 Subject: [PATCH] Move "#if HAVE_LIBSFDO" inside desktop-entry.h --- include/desktop-entry.h | 3 +++ src/osd-field.c | 2 -- src/server.c | 4 ---- src/ssd/ssd-titlebar.c | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/desktop-entry.h b/include/desktop-entry.h index ca3f77e4..f0d93e3a 100644 --- a/include/desktop-entry.h +++ b/include/desktop-entry.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #ifndef LABWC_DESKTOP_ENTRY_H #define LABWC_DESKTOP_ENTRY_H +#include "config.h" +#if HAVE_LIBSFDO struct server; @@ -23,4 +25,5 @@ struct lab_img *desktop_entry_load_icon( const char *desktop_entry_name_lookup(struct server *server, const char *app_id); +#endif /* HAVE_LIBSFDO */ #endif /* LABWC_DESKTOP_ENTRY_H */ diff --git a/src/osd-field.c b/src/osd-field.c index 8da1933d..a6b0763a 100644 --- a/src/osd-field.c +++ b/src/osd-field.c @@ -7,9 +7,7 @@ #include "view.h" #include "workspaces.h" #include "labwc.h" -#if HAVE_LIBSFDO #include "desktop-entry.h" -#endif #include "osd.h" /* includes '%', terminating 's' and NULL byte, 8 is enough for %-9999s */ diff --git a/src/server.c b/src/server.c index 2c611bd3..bffea515 100644 --- a/src/server.c +++ b/src/server.c @@ -35,11 +35,7 @@ #include "config/rcxml.h" #include "config/session.h" #include "decorations.h" - -#if HAVE_LIBSFDO #include "desktop-entry.h" -#endif - #include "idle.h" #include "input/keyboard.h" #include "labwc.h" diff --git a/src/ssd/ssd-titlebar.c b/src/ssd/ssd-titlebar.c index 9eccc3ae..6220cb8a 100644 --- a/src/ssd/ssd-titlebar.c +++ b/src/ssd/ssd-titlebar.c @@ -10,9 +10,7 @@ #include "common/scaled-img-buffer.h" #include "common/scene-helpers.h" #include "common/string-helpers.h" -#if HAVE_LIBSFDO #include "desktop-entry.h" -#endif #include "img/img.h" #include "labwc.h" #include "node.h" -- 2.52.0