[nautilus-sendto] Remove nautilus extension
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-sendto] Remove nautilus extension
- Date: Mon, 1 Nov 2010 13:24:33 +0000 (UTC)
commit f7d090f3bf8a5d0719dcc921e0cd46f3f2936033
Author: Bastien Nocera <hadess hadess net>
Date: Mon Nov 1 13:23:06 2010 +0000
Remove nautilus extension
The code is now directly in nautilus, as is done in Rhythmbox
and Evolution.
https://bugzilla.gnome.org/show_bug.cgi?id=633485
configure.in | 20 ----
po/POTFILES.in | 2 -
src/Makefile.am | 2 +-
src/extension/Makefile.am | 22 -----
src/extension/nautilus-nste.c | 157 --------------------------------
src/extension/nautilus-nste.h | 51 ----------
src/extension/nautilus-sendto-module.c | 56 -----------
7 files changed, 1 insertions(+), 309 deletions(-)
---
diff --git a/configure.in b/configure.in
index 4ca38c5..64ab7a2 100644
--- a/configure.in
+++ b/configure.in
@@ -61,25 +61,6 @@ AC_SUBST(NAUTILUS_SENDTO_LIBS)
PKG_CHECK_MODULES(GIO, gio-2.0)
-PKG_CHECK_MODULES(NAUTILUS_EXT_SENDTO,\
- libnautilus-extension >= $NAUTILUS_EXTENSION)
-AC_SUBST(NAUTILUS_EXT_SENDTO_CFLAGS)
-AC_SUBST(NAUTILUS_EXT_SENDTO_LIBS)
-
-dnl Get nautilus extensions directory
-dnl ---------------------------------
-
-AC_ARG_WITH(nautilusdir,
- AS_HELP_STRING([--with-nautilusdir=DIR],[Installation path for Nautilus extension @<:@auto@:>@]),
- [ac_with_nautilusdir=$withval],
- [ac_with_nautilusdir=""])
-if test "${ac_with_nautilusdir}" = ""; then
- ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
-fi
-
-AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}])
-AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}])
-
# The full list of plugins
allowed_plugins="evolution gajim nautilus-burn pidgin removable-devices socialweb upnp"
@@ -234,7 +215,6 @@ Makefile
data/Makefile
data/nautilus-sendto.pc
src/Makefile
-src/extension/Makefile
src/plugins/Makefile
src/plugins/evolution/Makefile
src/plugins/gajim/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d2c19da..1243180 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,5 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-src/extension/nautilus-nste.c
-src/extension/nautilus-nste.h
src/nautilus-sendto-command.c
src/nautilus-sendto-mimetype.c
data/org.gnome.Nautilus.Sendto.gschema.xml.in
diff --git a/src/Makefile.am b/src/Makefile.am
index ea0c637..d4d6711 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-SUBDIRS = extension plugins
+SUBDIRS = plugins
INCLUDES = \
-DDATADIR=\"$(datadir)\" \
-DPLUGINDIR=\"$(pkglibdir)/plugins\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]