diff options
| author | Barnabás Pőcze <pobrn@protonmail.com> | 2023-02-19 03:24:55 +0000 |
|---|---|---|
| committer | Corey Berla <corey@berla.me> | 2023-02-19 03:24:55 +0000 |
| commit | 427faf9ebdb301427e29aabefdc2365c05b50355 (patch) | |
| tree | 16e7854921923bbafccb72b98f6a0dba995a12c7 /src/nautilus-file-conflict-dialog.h | |
| parent | 5f1680f9df8d6a62681a878975a1cec75a328a3d (diff) | |
| download | nautilus-427faf9ebdb301427e29aabefdc2365c05b50355.tar.gz | |
general: Change libadwaita include path
The libadwaita pkg-config adds `-I/usr/include/libadwaita-1`
(or similar) to the compiler flags, which means that
#include <adwaita.h>
is sufficient, and the currently used
#include <libadwaita-1/adwaita.h>
is not necessary.
Not only is it not necessary, but it prevents nautilus from being
built with an uninstalled libadwaita build (either meson subproject
or otherwise). To fix that, remove the `libadwaita-1/` prefix.
The libadwaita test programs also only `#include <adwaita.h>`, and
according to Debian Code Search, that is the more popular version.
https://codesearch.debian.net/search?q=%23include+%3Cadwaita.h%3E&literal=1
https://codesearch.debian.net/search?q=%23include+%3Clibadwaita-1%2Fadwaita.h%3E&literal=1
Diffstat (limited to 'src/nautilus-file-conflict-dialog.h')
| -rw-r--r-- | src/nautilus-file-conflict-dialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-file-conflict-dialog.h b/src/nautilus-file-conflict-dialog.h index 55dfa9e44..746e00ed9 100644 --- a/src/nautilus-file-conflict-dialog.h +++ b/src/nautilus-file-conflict-dialog.h @@ -22,10 +22,10 @@ #pragma once +#include <adwaita.h> #include <glib-object.h> #include <gio/gio.h> #include <gtk/gtk.h> -#include <libadwaita-1/adwaita.h> G_BEGIN_DECLS |