[file-roller] Remove nautilus extension
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] Remove nautilus extension
- Date: Mon, 22 Aug 2016 18:47:09 +0000 (UTC)
commit da09ee41ca7c9b63082cf2a35ae19701c34adca7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Aug 22 12:07:40 2016 -0500
Remove nautilus extension
For GNOME 3.22, this functionality is now built directly into nautilus.
https://bugzilla.gnome.org/show_bug.cgi?id=770248
Makefile.am | 7 -
README | 1 -
configure.ac | 27 ---
nautilus/Makefile.am | 23 --
nautilus/fileroller-module.c | 56 -----
nautilus/nautilus-fileroller.c | 447 ----------------------------------------
nautilus/nautilus-fileroller.h | 51 -----
po/POTFILES.in | 3 -
8 files changed, 0 insertions(+), 615 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0a21675..a9acd51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,9 @@
ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
-if ENABLE_NAUTILUS_ACTIONS
-NAUTILUS = nautilus
-else
-NAUTILUS =
-endif
-
SUBDIRS = \
data \
src \
help \
- $(NAUTILUS) \
po
distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out'
diff --git a/README b/README
index 1ce5348..2b55dc9 100644
--- a/README
+++ b/README
@@ -70,7 +70,6 @@
* libgnome >= 2.6.0
* libgnomeui >= 2.6.0
* libglade >= 2.4.0
- * libnautilus-extension >= 2.22.2 (optional)
* Install
diff --git a/configure.ac b/configure.ac
index b4c0dbf..d7f0475 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,6 @@ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
GLIB_REQUIRED=2.36.0
GIO_REQUIRED=2.36.0
GTK_REQUIRED=3.13.2
-NAUTILUS_REQUIRED=2.22.2
JSON_GLIB_REQUIRED=0.14.0
LIBNOTIFY_REQUIRED=0.4.3
LIBARCHIVE_REQUIRED=3.0.0
@@ -98,30 +97,6 @@ AC_SUBST(FR_LIBS)
dnl ******************************
dnl
-dnl nautilus actions
-dnl
-AC_ARG_ENABLE([nautilus_actions],
- [AS_HELP_STRING([--disable-nautilus-actions],
- [do not build the nautilus context menu actions])],,
- [enable_nautilus_actions=yes])
-
-if test x"$enable_nautilus_actions" != x"no" ; then
- PKG_CHECK_MODULES(NAUTILUS, \
- [libnautilus-extension >= $NAUTILUS_REQUIRED \
- glib-2.0 \
- gio-2.0],
- [enable_nautilus_actions=yes],
- [enable_nautilus_actions=no])
- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-fi
-
-AC_SUBST(NAUTILUS_CFLAGS)
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
-AM_CONDITIONAL(ENABLE_NAUTILUS_ACTIONS, test x"$enable_nautilus_actions" != x"no")
-
-dnl ******************************
-dnl
dnl json-glib-1.0
dnl
PKG_CHECK_MODULES(JSON_GLIB,
@@ -303,7 +278,6 @@ AC_CONFIG_FILES([Makefile
src/commands/Makefile
src/sh/Makefile
src/ui/Makefile
- nautilus/Makefile
help/Makefile
po/Makefile.in])
AC_OUTPUT
@@ -319,7 +293,6 @@ Configuration:
Disable deprecated code : ${disable_deprecated}
Run in place : ${enable_run_in_place}
Internal mkdtemp : ${mkdtemp_missing}
- Nautilus module : ${enable_nautilus_actions}
PackageKit support : ${enable_packagekit}
Use libmagic : ${enable_magic}
JSON support : ${enable_json_glib}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 03282a8..f09b6a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,9 +7,6 @@
data/org.gnome.FileRoller.appdata.xml.in
data/org.gnome.FileRoller.desktop.in.in
[type: gettext/gsettings]data/org.gnome.FileRoller.gschema.xml
-nautilus/fileroller-module.c
-nautilus/nautilus-fileroller.c
-nautilus/nautilus-fileroller.h
src/commands/rpm2cpio.c
src/dlg-add.c
src/dlg-add.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]