[vinagre] Bump VINAGRE_ABI_VERSION to 3.0

[David King <davidk src gnome org>]

commit b1d3f480957c74bc59a2df479291ad4f6cfcf9e9
Author: David King <amigadave amigadave com>
Date:   Mon Apr 4 19:00:20 2011 +0200

    Bump VINAGRE_ABI_VERSION to 3.0
    
    AC_DEFINE the ABI version and use it in vinagre/vinagre-dirs.c. Use the
    ABI version to construct the plugins DATA and LIBS variables. Install
    gobject-introspection files to a directory that depends on the ABI
    version.

 Makefile.am            |    2 +-
 configure.ac           |    9 ++++-----
 vinagre/vinagre-dirs.c |   10 ++++++----
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3ac43ca..2794c0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,7 +186,7 @@ Vinagre_3_0_gir_INCLUDES = $(INTROSPECTION_GIR_INCLUDES)
 girdir = $(pkgdatadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(libdir)/vinagre-1/girepository-1.0
+typelibdir = $(libdir)/vinagre- VINAGRE_ABI_VERSION@/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += \
diff --git a/configure.ac b/configure.ac
index 706ebc1..188dfe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,13 +22,12 @@ PKG_PROG_PKG_CONFIG([0.16])
 
 AC_PROG_SED
 
-# TODO: Bump before release with GTK+ 3 support.
-# TODO: Use in plugin path and where appropriate.
-AC_SUBST([VINAGRE_ABI_VERSION], [1.0])
+AC_SUBST([VINAGRE_ABI_VERSION], [3.0])
+AC_DEFINE_UNQUOTED([VINAGRE_ABI_VERSION], ["$VINAGRE_ABI_VERSION"], [Vinagre ABI version])
 
 AC_SUBST([PLUGIN_LIBTOOL_FLAGS], ["-module -avoid-version"])
-AC_SUBST([VINAGRE_PLUGINS_DATA_DIR], ["$datadir/vinagre-1/plugins"])
-AC_SUBST([VINAGRE_PLUGINS_LIBS_DIR], ["$libdir/vinagre-1/plugins"])
+AC_SUBST([VINAGRE_PLUGINS_DATA_DIR], ["$datadir/vinagre-$VINAGRE_ABI_VERSION/plugins"])
+AC_SUBST([VINAGRE_PLUGINS_LIBS_DIR], ["$libdir/vinagre-$VINAGRE_ABI_VERSION/plugins"])
 
 GLIB_DEPS="glib-2.0 >= 2.25.11 gio-unix-2.0 >= 2.25.11"
 GTHREAD_DEPS="gthread-2.0 >= 2.0.0"
diff --git a/vinagre/vinagre-dirs.c b/vinagre/vinagre-dirs.c
index b9b75f2..7cc6c4a 100644
--- a/vinagre/vinagre-dirs.c
+++ b/vinagre/vinagre-dirs.c
@@ -20,6 +20,8 @@
 
 #include "vinagre-dirs.h"
 
+#include "config.h"
+
 gchar *
 vinagre_dirs_get_user_config_dir ()
 {
@@ -78,7 +80,7 @@ vinagre_dirs_get_vinagre_data_dir (void)
 
 #ifndef G_OS_WIN32
   data_dir = g_build_filename (DATADIR,
-			       "vinagre-1",
+			       "vinagre-" VINAGRE_ABI_VERSION,
 			       NULL);
 #else
   gchar *win32_dir;
@@ -87,7 +89,7 @@ vinagre_dirs_get_vinagre_data_dir (void)
 
   data_dir = g_build_filename (win32_dir,
 			       "share",
-			       "vinagre-1",
+			       "vinagre-" VINAGRE_ABI_VERSION,
 			       NULL);
   g_free (win32_dir);
 #endif
@@ -127,7 +129,7 @@ vinagre_dirs_get_vinagre_lib_dir (void)
 
 #ifndef G_OS_WIN32
   lib_dir = g_build_filename (LIBDIR,
-			      "vinagre-1",
+			      "vinagre-" VINAGRE_ABI_VERSION,
 			      NULL);
 #else
   gchar *win32_dir;
@@ -136,7 +138,7 @@ vinagre_dirs_get_vinagre_lib_dir (void)
 
   lib_dir = g_build_filename (win32_dir,
 			      "lib",
-			      "vinagre-1",
+			      "vinagre-" VINAGRE_ABI_VERSION,
 			      NULL);
 	
   g_free (win32_dir);