Move "#if HAVE_LIBSFDO" inside desktop-entry.h

diff --git a/include/desktop-entry.h b/include/desktop-entry.h
index ca3f77e4de1f39487da5e2b586eeed56104bf68b..f0d93e3acb6b03e3a3a462012531a52737b2fad2 100644 (file)
--- 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 8da1933d9f7f04be2248e6f77ec6ac16345077b2..a6b0763a923ba2ebaaeec700b2472aed03a2a0ab 100644 (file)
--- 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 2c611bd3fec736daae6a53bdcd9d6187f97705ec..bffea515199fcafd8d2f82a8af2258569212069c 100644 (file)
--- 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 9eccc3ae68256fec75aaa71acd88cd66f7e5d00f..6220cb8a525d854f361dd73340669c6039f84ab9 100644 (file)
--- 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"