diff options
| -rw-r--r-- | extensions/meson.build | 1 | ||||
| -rw-r--r-- | extensions/sendto/meson.build (renamed from nautilus-sendto-extension/meson.build) | 0 | ||||
| -rw-r--r-- | extensions/sendto/nautilus-nste.c (renamed from nautilus-sendto-extension/nautilus-nste.c) | 6 | ||||
| -rw-r--r-- | extensions/sendto/nautilus-nste.h (renamed from nautilus-sendto-extension/nautilus-nste.h) | 0 | ||||
| -rw-r--r-- | extensions/sendto/nautilus-sendto-module.c (renamed from nautilus-sendto-extension/nautilus-sendto-module.c) | 3 | ||||
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/extensions/meson.build b/extensions/meson.build index f5057cf87..41048589c 100644 --- a/extensions/meson.build +++ b/extensions/meson.build @@ -1 +1,2 @@ subdir('image-properties') +subdir('sendto') diff --git a/nautilus-sendto-extension/meson.build b/extensions/sendto/meson.build index fde884785..fde884785 100644 --- a/nautilus-sendto-extension/meson.build +++ b/extensions/sendto/meson.build diff --git a/nautilus-sendto-extension/nautilus-nste.c b/extensions/sendto/nautilus-nste.c index eb25566a1..5c2cc0e94 100644 --- a/nautilus-sendto-extension/nautilus-nste.c +++ b/extensions/sendto/nautilus-nste.c @@ -23,9 +23,7 @@ #include <config.h> #include <string.h> #include <glib/gi18n-lib.h> -#include <libnautilus-extension/nautilus-extension-types.h> -#include <libnautilus-extension/nautilus-file-info.h> -#include <libnautilus-extension/nautilus-menu-provider.h> +#include <nautilus-extension.h> #include "nautilus-nste.h" @@ -130,7 +128,7 @@ nautilus_nste_get_file_items (NautilusMenuProvider *provider, } static void -nautilus_nste_menu_provider_iface_init (NautilusMenuProviderIface *iface) +nautilus_nste_menu_provider_iface_init (NautilusMenuProviderInterface *iface) { iface->get_file_items = nautilus_nste_get_file_items; } diff --git a/nautilus-sendto-extension/nautilus-nste.h b/extensions/sendto/nautilus-nste.h index 1042bc9b9..1042bc9b9 100644 --- a/nautilus-sendto-extension/nautilus-nste.h +++ b/extensions/sendto/nautilus-nste.h diff --git a/nautilus-sendto-extension/nautilus-sendto-module.c b/extensions/sendto/nautilus-sendto-module.c index 8aae9be0e..c21f0c877 100644 --- a/nautilus-sendto-extension/nautilus-sendto-module.c +++ b/extensions/sendto/nautilus-sendto-module.c @@ -21,8 +21,7 @@ */ #include <config.h> -#include <libnautilus-extension/nautilus-extension-types.h> -#include <libnautilus-extension/nautilus-column-provider.h> +#include <nautilus-extension.h> #include <glib/gi18n-lib.h> #include "nautilus-nste.h" diff --git a/meson.build b/meson.build index 37fde5ed9..ab225e360 100644 --- a/meson.build +++ b/meson.build @@ -44,7 +44,9 @@ libgd_dep = libgd.get_variable('libgd_dep') libm = cc.find_library('libm') gail = dependency('gail-3.0') -gexiv = dependency('gexiv2', version: '>= 0.10.0') +if get_option('extensions') + gexiv = dependency('gexiv2', version: '>= 0.10.0') +endif gio = dependency('gio-2.0', version: glib_ver) gio_unix = dependency('gio-unix-2.0', version: glib_ver) glib = dependency('glib-2.0', version: glib_ver) @@ -99,9 +101,8 @@ subdir('po') if get_option('docs') subdir('docs') endif -subdir('extensions') -if get_option('nst_extension') - subdir('nautilus-sendto-extension') +if get_option('extensions') + subdir('extensions') endif # Compile GSettings schemas when installing from source. diff --git a/meson_options.txt b/meson_options.txt index aadbdfead..6a8266777 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,6 @@ option('docs', type: 'boolean', value: false) option('profiling', type: 'boolean', value: false) -option('nst_extension', type: 'boolean', value: true) +option('extensions', type: 'boolean', value: true) option('packagekit', type: 'boolean', value: true) option('selinux', type: 'boolean', value: false) option('display-tests', type: 'boolean', value: false) |