mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-02 14:03:39 +00:00
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
This commit is contained in:
parent
5f1680f9df
commit
427faf9ebd
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <adwaita.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <libadwaita-1/adwaita.h>
|
||||
|
||||
#include "nautilus-window-slot.h"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <adwaita.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <libadwaita-1/adwaita.h>
|
||||
|
||||
#include "nautilus-window-slot.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 ())
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <adwaita.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <libadwaita-1/adwaita.h>
|
||||
|
||||
#include "nautilus-window-slot.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);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <libadwaita-1/adwaita.h>
|
||||
#include <adwaita.h>
|
||||
|
||||
#include "nautilus-types.h"
|
||||
#include "nautilus-view-item.h"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <adwaita.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <libadwaita-1/adwaita.h>
|
||||
|
||||
#include "nautilus-window-slot.h"
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <adwaita.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <libadwaita-1/adwaita.h>
|
||||
|
||||
#include "nautilus-types.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
|
||||
|
||||
|
|
Loading…
Reference in a new issue