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

19 files changed, 19 insertions, 19 deletions

diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index b9257d315..f9e44294f 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #include "eel-stock-dialogs.h"
 
+#include <adwaita.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #define TIMED_WAIT_STANDARD_DURATION 2000
 #define TIMED_WAIT_MIN_TIME_UP 3000
diff --git a/src/nautilus-app-chooser.c b/src/nautilus-app-chooser.c
index fa16f0b99..579ba1e1b 100644
--- a/src/nautilus-app-chooser.c
+++ b/src/nautilus-app-chooser.c
@@ -6,7 +6,7 @@
 
 #include "nautilus-app-chooser.h"
 
-#include <libadwaita-1/adwaita.h>
+#include <adwaita.h>
 #include <glib/gi18n.h>
 
 #include <eel/eel-string.h>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 26be55046..1dabb1802 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -26,6 +26,7 @@
 
 #include "nautilus-application.h"
 
+#include <adwaita.h>
 #include <eel/eel-stock-dialogs.h>
 #include <fcntl.h>
 #include <gdk/gdk.h>
@@ -33,7 +34,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 #include <nautilus-extension.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index 61e012d9d..fcedd45b9 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -22,12 +22,12 @@
 
 #include <config.h>
 
+#include <adwaita.h>
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 #include <gio/gio.h>
 
 #include <glib/gi18n.h>
diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c
index 53735eb80..b6fbf77c1 100644
--- a/src/nautilus-compress-dialog-controller.c
+++ b/src/nautilus-compress-dialog-controller.c
@@ -17,9 +17,9 @@
  *
  */
 
+#include <adwaita.h>
 #include <glib/gi18n.h>
 #include <gnome-autoar/gnome-autoar.h>
-#include <libadwaita-1/adwaita.h>
 
 #include <eel/eel-vfs-extensions.h>
 
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
 
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 9aa6755e3..f3391571b 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -42,13 +42,13 @@
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-string.h>
 
+#include <adwaita.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <glib.h>
-#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-error-reporting.h"
 #include "nautilus-operations-ui-manager.h"
diff --git a/src/nautilus-history-controls.h b/src/nautilus-history-controls.h
index 26d484d53..31beaa919 100644
--- a/src/nautilus-history-controls.h
+++ b/src/nautilus-history-controls.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-window-slot.h"
 
diff --git a/src/nautilus-places-view.c b/src/nautilus-places-view.c
index 3ec1cb04f..922567731 100644
--- a/src/nautilus-places-view.c
+++ b/src/nautilus-places-view.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libadwaita-1/adwaita.h>
+#include <adwaita.h>
 
 #include "nautilus-mime-actions.h"
 #include "nautilus-places-view.h"
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 352ed4286..4a6477d29 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -25,9 +25,9 @@
 
 #include "nautilus-preferences-window.h"
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libadwaita-1/adwaita.h>
 
 #include <glib/gi18n.h>
 
diff --git a/src/nautilus-progress-indicator.h b/src/nautilus-progress-indicator.h
index 9b69ac075..2175e3f24 100644
--- a/src/nautilus-progress-indicator.h
+++ b/src/nautilus-progress-indicator.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-window-slot.h"
 
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index 4b769bd1a..1d9eb94ad 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #define NAUTILUS_TYPE_PROPERTIES_WINDOW (nautilus_properties_window_get_type ())
 
diff --git a/src/nautilus-special-location-bar.h b/src/nautilus-special-location-bar.h
index 52d67e3ca..10d50b7de 100644
--- a/src/nautilus-special-location-bar.h
+++ b/src/nautilus-special-location-bar.h
@@ -18,9 +18,9 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libadwaita-1/adwaita.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/nautilus-toolbar.h b/src/nautilus-toolbar.h
index a61a3cb9f..11e1405b8 100644
--- a/src/nautilus-toolbar.h
+++ b/src/nautilus-toolbar.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-window-slot.h"
 
diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h
index f3df67f9c..58b5b3c4f 100644
--- a/src/nautilus-ui-utilities.h
+++ b/src/nautilus-ui-utilities.h
@@ -22,8 +22,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 void        nautilus_gmenu_set_from_model           (GMenu             *target_menu,
                                                      GMenuModel        *source_model);
diff --git a/src/nautilus-view-cell.h b/src/nautilus-view-cell.h
index 78297b82d..f0616242b 100644
--- a/src/nautilus-view-cell.h
+++ b/src/nautilus-view-cell.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <libadwaita-1/adwaita.h>
+#include <adwaita.h>
 
 #include "nautilus-types.h"
 #include "nautilus-view-item.h"
diff --git a/src/nautilus-view-controls.h b/src/nautilus-view-controls.h
index 1b54737aa..1b1bcae4f 100644
--- a/src/nautilus-view-controls.h
+++ b/src/nautilus-view-controls.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-window-slot.h"
 
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 2f7add9b0..45ed35aa3 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
-#include <libadwaita-1/adwaita.h>
 
 #include "nautilus-types.h"
 
diff --git a/src/nautilus-x-content-bar.h b/src/nautilus-x-content-bar.h
index 11f05ec91..5d83e0485 100644
--- a/src/nautilus-x-content-bar.h
+++ b/src/nautilus-x-content-bar.h
@@ -22,9 +22,9 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libadwaita-1/adwaita.h>
 
 G_BEGIN_DECLS