diff options
author | Ernestas Kulik <ernestask@gnome.org> | 2018-02-13 07:09:30 +0200 |
---|---|---|
committer | Ernestas Kulik <ernestask@gnome.org> | 2018-02-13 07:22:49 +0200 |
commit | 0e5815e95ae2f071be73b75b57925aceb23f503a (patch) | |
tree | 3338872f3c136f594d3eb22464cc6615b53ced0a /libnautilus-extension | |
parent | bf4c431b45ed6894c56559b77e3db896ac097535 (diff) | |
download | nautilus-0e5815e95ae2f071be73b75b57925aceb23f503a.tar.gz |
libnautilus-extension: add removed includes back in
Some extensions break because of weird inclusion patterns.
Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/252
Diffstat (limited to 'libnautilus-extension')
-rw-r--r-- | libnautilus-extension/nautilus-column-provider.h | 3 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-column.h | 2 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-extension-types.h | 6 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-info-provider.h | 2 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-location-widget-provider.h | 2 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-menu-provider.h | 3 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-menu.h | 2 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-property-page-provider.h | 5 | ||||
-rw-r--r-- | libnautilus-extension/nautilus-property-page.h | 2 |
9 files changed, 25 insertions, 2 deletions
diff --git a/libnautilus-extension/nautilus-column-provider.h b/libnautilus-extension/nautilus-column-provider.h index de730bf5f..2873c66b7 100644 --- a/libnautilus-extension/nautilus-column-provider.h +++ b/libnautilus-extension/nautilus-column-provider.h @@ -35,6 +35,9 @@ #endif #include <glib-object.h> +/* These should be removed at some point. */ +#include "nautilus-extension-types.h" +#include "nautilus-column.h" G_BEGIN_DECLS diff --git a/libnautilus-extension/nautilus-column.h b/libnautilus-extension/nautilus-column.h index c4e3ad9af..fa919471b 100644 --- a/libnautilus-extension/nautilus-column.h +++ b/libnautilus-extension/nautilus-column.h @@ -29,6 +29,8 @@ #endif #include <glib-object.h> +/* This should be removed at some point. */ +#include "nautilus-extension-types.h" G_BEGIN_DECLS diff --git a/libnautilus-extension/nautilus-extension-types.h b/libnautilus-extension/nautilus-extension-types.h index 43a0b2056..33d6f5223 100644 --- a/libnautilus-extension/nautilus-extension-types.h +++ b/libnautilus-extension/nautilus-extension-types.h @@ -27,8 +27,10 @@ #ifndef NAUTILUS_EXTENSION_TYPES_H #define NAUTILUS_EXTENSION_TYPES_H -#include <nautilus-extension.h> - +#if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "This header is deprecated, include <nautilus-extension.h> instead." +#endif + +#include <nautilus-extension.h> #endif diff --git a/libnautilus-extension/nautilus-info-provider.h b/libnautilus-extension/nautilus-info-provider.h index 479f19b28..2f54490af 100644 --- a/libnautilus-extension/nautilus-info-provider.h +++ b/libnautilus-extension/nautilus-info-provider.h @@ -35,6 +35,8 @@ #include <glib-object.h> #include "nautilus-file-info.h" +/* This should be removed at some point. */ +#include "nautilus-extension-types.h" G_BEGIN_DECLS diff --git a/libnautilus-extension/nautilus-location-widget-provider.h b/libnautilus-extension/nautilus-location-widget-provider.h index e95ca0523..656de7fdb 100644 --- a/libnautilus-extension/nautilus-location-widget-provider.h +++ b/libnautilus-extension/nautilus-location-widget-provider.h @@ -37,6 +37,8 @@ #include <glib-object.h> #include <gtk/gtk.h> +/* This should be removed at some point. */ +#include "nautilus-extension-types.h" G_BEGIN_DECLS diff --git a/libnautilus-extension/nautilus-menu-provider.h b/libnautilus-extension/nautilus-menu-provider.h index bd887feaa..3633e19a4 100644 --- a/libnautilus-extension/nautilus-menu-provider.h +++ b/libnautilus-extension/nautilus-menu-provider.h @@ -36,6 +36,9 @@ #include <glib-object.h> #include <gtk/gtk.h> #include "nautilus-file-info.h" +/* These should be removed at some point. */ +#include "nautilus-extension-types.h" +#include "nautilus-menu.h" G_BEGIN_DECLS diff --git a/libnautilus-extension/nautilus-menu.h b/libnautilus-extension/nautilus-menu.h index efac9a0d1..bea8956d4 100644 --- a/libnautilus-extension/nautilus-menu.h +++ b/libnautilus-extension/nautilus-menu.h @@ -26,6 +26,8 @@ #define NAUTILUS_MENU_H #include <glib-object.h> +/* This should be removed at some point. */ +#include "nautilus-extension-types.h" #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." diff --git a/libnautilus-extension/nautilus-property-page-provider.h b/libnautilus-extension/nautilus-property-page-provider.h index 55b7742e7..7198a1b78 100644 --- a/libnautilus-extension/nautilus-property-page-provider.h +++ b/libnautilus-extension/nautilus-property-page-provider.h @@ -35,6 +35,11 @@ #endif #include <glib-object.h> +/* These should be removed at some point. */ +#include "nautilus-extension-types.h" +#include "nautilus-file-info.h" +#include "nautilus-property-page.h" + G_BEGIN_DECLS diff --git a/libnautilus-extension/nautilus-property-page.h b/libnautilus-extension/nautilus-property-page.h index 483df7c72..0393c9b81 100644 --- a/libnautilus-extension/nautilus-property-page.h +++ b/libnautilus-extension/nautilus-property-page.h @@ -30,6 +30,8 @@ #include <glib-object.h> #include <gtk/gtk.h> +/* This should be removed at some point. */ +#include "nautilus-extension-types.h" G_BEGIN_DECLS |