[gnome-user-share] Remove nautilus extension
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-share] Remove nautilus extension
- Date: Fri, 15 Jul 2022 10:25:17 +0000 (UTC)
commit 4e646d82179cf8bb7358cafadebf26632891c7a4
Author: Maximiliano Sandoval R <msandova gnome org>
Date: Thu Jul 14 21:43:39 2022 +0200
Remove nautilus extension
It will live inside of Nautilus, see https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/883.
Closes: https://gitlab.gnome.org/GNOME/gnome-user-share/-/merge_requests/16
.gitlab-ci.yml | 2 -
meson.build | 10 ---
meson_options.txt | 2 -
po/POTFILES.in | 2 -
src/meson.build | 17 ----
src/nautilus-share-bar.c | 126 ----------------------------
src/nautilus-share-bar.h | 60 --------------
src/share-extension.c | 209 -----------------------------------------------
src/user_share-common.c | 27 ------
src/user_share-common.h | 1 -
10 files changed, 456 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe4cdfc..f2e534b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,7 @@ variables:
meson
glibc-devel
glib2-devel
- gtk3-devel
libselinux-devel
- nautilus-devel
systemd-devel
httpd
mod_dnssd
diff --git a/meson.build b/meson.build
index 6ee9091..4d65881 100644
--- a/meson.build
+++ b/meson.build
@@ -58,7 +58,6 @@ add_project_arguments(common_flags, language: 'c')
gio_dep = dependency('gio-2.0', version: '>= 2.71.3')
gio_unix_dep = dependency('gio-unix-2.0')
glib_dep = dependency('glib-2.0', version: '>= 2.71.3')
-gtk_dep = dependency('gtk+-3.0')
# GIO schemas
gio_schemasdir = gio_dep.get_variable(
@@ -100,14 +99,6 @@ config_h.set('HAVE_SELINUX', have_selinux)
# Check for the HTTPD modules path
modules_path = get_option('modules_path')
-# Check for nautilus for the share bar
-libnautilus_extension_dep = dependency('libnautilus-extension', version: '>= 3.27.90')
-libnautilus_extension_extensiondir = libnautilus_extension_dep.get_variable(
- pkgconfig: 'extensiondir',
- pkgconfig_define: ['libdir', user_share_prefix / user_share_libdir]
-)
-message('installing nautilus plugin in: ' + libnautilus_extension_extensiondir)
-
subdir('data')
subdir('po')
subdir('src')
@@ -124,6 +115,5 @@ gnome.post_install(
output = user_share_name + ' was configured with the following options:\n'
output += '** httpd location: ' + httpd_path + '\n'
output += '** httpd modules_path: ' + modules_path + '\n'
-output += '** nautilus extension path: ' + libnautilus_extension_extensiondir + '\n\n'
output += 'Do note Apache 2.2 and mod_dnssd 0.6 are required to use ' + user_share_name + '.'
message(output)
diff --git a/meson_options.txt b/meson_options.txt
index 8e4cbaf..03a4901 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,4 @@
option('systemduserunitdir', type: 'string', value: '', description: 'custom directory for systemd user
units')
-option('nautilus_extension', type: 'boolean', value: false, description: 'Enable nautilus extension')
-
option('httpd', type: 'array', value: ['httpd', '/usr/sbin/httpd', 'apache2', '/usr/sbin/apache2', 'httpd2',
'/usr/sbin/httpd2'], description: 'Specify the binary used for the Apache httpd binary (default: httpd)')
option('modules_path', type: 'string', value: '/etc/httpd/modules/', description: 'Path where the httpd
modules are located (default: /etc/httpd/modules/')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 96ff086..863412e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,5 @@
# Please keep this file sorted alphabetically.
data/org.gnome.desktop.file-sharing.gschema.xml
data/gnome-user-share-webdav.desktop.in.in
-src/nautilus-share-bar.c
-src/share-extension.c
src/http.c
src/user_share-webdav.c
diff --git a/src/meson.build b/src/meson.build
index 128de3b..3936462 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -48,24 +48,7 @@ executable(
install_dir: user_share_libexecdir,
)
-sources = files(
- 'nautilus-share-bar.c',
- 'share-extension.c',
-)
-
deps = [
- gtk_dep,
gio_unix_dep,
- libnautilus_extension_dep,
libuser_share_common_dep,
]
-
-shared_module(
- 'nautilus-share-extension',
- sources: sources,
- include_directories: top_inc,
- dependencies: deps,
- c_args: common_c_flags,
- install: true,
- install_dir: libnautilus_extension_extensiondir,
-)
diff --git a/src/user_share-common.c b/src/user_share-common.c
index cc1883a..c44f8af 100644
--- a/src/user_share-common.c
+++ b/src/user_share-common.c
@@ -54,30 +54,3 @@ lookup_public_dir (void)
"Public",
TRUE);
}
-
-GFile *
-lookup_dir_with_fallback (GUserDirectory directory)
-{
- GFile *file;
- char *path;
- const char *name;
-
- if (directory == G_USER_DIRECTORY_PUBLIC_SHARE)
- name = "Public";
- else if (directory == G_USER_DIRECTORY_DOWNLOAD)
- name = "Downloads";
- else
- g_assert_not_reached ();
-
- path = lookup_special_dir (directory,
- name,
- FALSE);
-
- if (path == NULL)
- return NULL;
-
- file = g_file_new_for_path (path);
- g_free (path);
-
- return file;
-}
diff --git a/src/user_share-common.h b/src/user_share-common.h
index 1ee2dae..c2b1464 100644
--- a/src/user_share-common.h
+++ b/src/user_share-common.h
@@ -26,4 +26,3 @@
#include <gio/gio.h>
char *lookup_public_dir (void);
-GFile *lookup_dir_with_fallback (GUserDirectory directory);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]