[nautilus] libnautilus-extension: use a different directory for 3.0

[Cosimo Cecchi <cosimoc src gnome org>]

commit fdae502d65f3c40dee4d418bd9d21270940aa93d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Dec 3 13:47:59 2010 +0100

    libnautilus-extension: use a different directory for 3.0
    
    So that old extensions do not pull in GTK+2 code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=624244

 configure.in                                       |    2 +-
 libnautilus-extension/Makefile.am                  |   12 ++++++------
 .../libnautilus-extension-uninstalled.pc.in        |    4 ++--
 libnautilus-extension/libnautilus-extension.pc.in  |    2 +-
 libnautilus-private/Makefile.am                    |    2 +-
 nautilus-sendto-extension/Makefile.am              |    2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/configure.in b/configure.in
index 82ce7ab..152f06b 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ m4_define(exempi_minver,               1.99.5)
 dnl 1. If the library code has changed at all since last release, then increment revision.
 dnl 2. If any interfaces have been added, then increment current and set revision to 0.
 dnl Interface break is not allowed.
-m4_define(nautilus_extension_current,  3)
+m4_define(nautilus_extension_current,  4)
 m4_define(nautilus_extension_revision, 0)
 
 AC_INIT(nautilus, 2.91.3, http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus)
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index 7db831d..9d83014 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -68,15 +68,15 @@ if HAVE_INTROSPECTION
 introspection_files =					\
 	$(libnautilus_extension_include_HEADERS)	\
 	$(libnautilus_extension_la_SOURCES)
-Nautilus-2.0.gir: libnautilus-extension.la Makefile
-Nautilus_2_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0
-Nautilus_2_0_gir_CFLAGS = \
+Nautilus-3.0.gir: libnautilus-extension.la Makefile
+Nautilus_3_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0
+Nautilus_3_0_gir_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(BASE_CFLAGS)
-Nautilus_2_0_gir_LIBS = libnautilus-extension.la
-Nautilus_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
-INTROSPECTION_GIRS += Nautilus-2.0.gir
+Nautilus_3_0_gir_LIBS = libnautilus-extension.la
+Nautilus_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += Nautilus-3.0.gir
 
 girdir = $(datadir)/gir-1.0/
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
index f0bcdc1..eee6aae 100644
--- a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
+++ b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
@@ -2,11 +2,11 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
-extensiondir= libdir@/nautilus/extensions-2.0
+extensiondir= libdir@/nautilus/extensions-3.0
 
 Name: libnautilus-extension
 Description: A library to create Nautilus view extensions
 Version: @VERSION@
-Requires: glib-2.0 gtk+-3.0
+Requires: glib-2.0 gio-2.0 gtk+-3.0
 Libs: ${pc_top_builddir}/${pcfiledir}/libnautilus-extension.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/..
diff --git a/libnautilus-extension/libnautilus-extension.pc.in b/libnautilus-extension/libnautilus-extension.pc.in
index 65f8e4b..1da3585 100644
--- a/libnautilus-extension/libnautilus-extension.pc.in
+++ b/libnautilus-extension/libnautilus-extension.pc.in
@@ -2,7 +2,7 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
-extensiondir= libdir@/nautilus/extensions-2.0
+extensiondir= libdir@/nautilus/extensions-3.0
 
 Name: libnautilus-extension
 Description: A library to create Nautilus view extensions
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index f147b64..b1500de 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\" 			\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
-	-DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-2.0"\" \
+	-DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-3.0"\" \
 	$(NULL)
 
 BUILT_SOURCES = \
diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
index 7f8300c..f4cf9e9 100644
--- a/nautilus-sendto-extension/Makefile.am
+++ b/nautilus-sendto-extension/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES=\
 	-DDATADIR=\""$(datadir)"\" \
 	$(NULL)
 
-nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
+nautilus_extensiondir = $(libdir)/nautilus/extensions-3.0
 nautilus_extension_LTLIBRARIES = libnautilus-sendto.la
 libnautilus_sendto_la_SOURCES =		\
 	nautilus-nste.c			\