[unique/unique-1.1] Port to GTK+ 3.0

[Bastien Nocera <hadess src gnome org>]

commit e353a4fc4d8a5ef465fa300fb3c8a40f62769370
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 12 18:12:44 2010 +0100

    Port to GTK+ 3.0
    
    And up the version of the library to 3.0 to match.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=618473

 .gitignore         |    2 ++
 Makefile.am        |    4 ++--
 configure.ac       |   16 ++++++++--------
 tests/Makefile.am  |    4 ++--
 unique.pc.in       |    2 +-
 unique/.gitignore  |    2 ++
 unique/Makefile.am |   18 +++++++++---------
 7 files changed, 26 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 465b0b9..b36688e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,8 @@ omf.make
 stamp-h1
 unique-1.0.pc
 unique-dbus-1.0.pc
+unique-3.0.pc
+unique-dbus-3.0.pc
 unique.pc
 /unique/bacon/*.lo
 /unique/bacon/*.o
diff --git a/Makefile.am b/Makefile.am
index 32de107..59fc26c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,11 @@ ACLOCAL_AMFLAGS = -I build/autotools
 
 SUBDIRS = build unique tests doc po
 
-unique-1.0.pc: unique.pc
+unique-3.0.pc: unique.pc
 	$(QUIET_GEN)cp -f $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = unique-1.0.pc
+pkgconfig_DATA = unique-3.0.pc
 
 EXTRA_DIST = unique.pc.in NEWS TODO
 
diff --git a/configure.ac b/configure.ac
index bc3163a..d2ea496 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # versioning
-m4_define([unique_major_version], [1])
-m4_define([unique_minor_version], [1])
-m4_define([unique_micro_version], [7])
+m4_define([unique_major_version], [2])
+m4_define([unique_minor_version], [90])
+m4_define([unique_micro_version], [0])
 m4_define([unique_version], [unique_major_version.unique_minor_version.unique_micro_version])
 m4_define([unique_api_version], [unique_major_version.unique_minor_version])
 
@@ -10,7 +10,7 @@ m4_define([unique_api_version], [unique_major_version.unique_minor_version])
 m4_define([unique_interface_age], [7])
 m4_define([unique_binary_age], [m4_eval(100 * unique_minor_version + unique_micro_version)])
 # This is the X.Y used in -lunique-FOO-X.Y
-m4_define([unique_api_version], [1.0])
+m4_define([unique_api_version], [3.0])
 # This is the X.Y used in the protocol negotiation
 m4_define([unique_protocol_version], [1.0])
 
@@ -62,13 +62,13 @@ AC_SUBST(UNIQUE_LT_VERSION_INFO)
 AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE)
 
 m4_define([glib_required], [2.12.0])
-m4_define([gtk_required],  [2.11.0])
+m4_define([gtk_required],  [2.90.0])
 m4_define([dbus_required], [0.70])
 
 PKG_CHECK_MODULES(UNIQUE, glib-2.0 >= glib_required dnl
-                          gtk+-2.0 >= gtk_required)
+                          gtk+-3.0 >= gtk_required)
 
-gdktarget=`$PKG_CONFIG --variable=target gdk-2.0`
+gdktarget=`$PKG_CONFIG --variable=target gdk-3.0`
 AS_IF([test "X$gdktarget" = "Xx11"],
       [
         AC_PATH_XTRA
@@ -188,7 +188,7 @@ AC_ARG_ENABLE([debug],
               [AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
                               [Turn on debugging @<:@default=debug_default@:>@])],
               [],
-              [enable_debug=debug_default])
+              [enable_debug=$debug_default])
 
 AS_CASE([$enable_debug],
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1938387..c0241c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,8 +5,8 @@ INCLUDES = \
 	$(UNIQUE_CFLAGS) 		\
 	$(UNIQUE_DEBUG_FLAGS)
 
-DEPS = $(top_builddir)/unique/libunique-1.0.la
-LDADD = $(top_builddir)/unique/libunique-1.0.la $(UNIQUE_LIBS)
+DEPS = $(top_builddir)/unique/libunique-3.0.la
+LDADD = $(top_builddir)/unique/libunique-3.0.la $(UNIQUE_LIBS)
 
 noinst_PROGRAMS = 	\
 	test-unique
diff --git a/unique.pc.in b/unique.pc.in
index 154517b..8803115 100644
--- a/unique.pc.in
+++ b/unique.pc.in
@@ -6,7 +6,7 @@ includedir= includedir@
 Name: Unique
 Description: Create single instance applications
 Version: @VERSION@
-Requires: gtk+-2.0
+Requires: gtk+-3.0
 Recommends: dbus-glib-1
 Libs: -L${libdir} -lunique- UNIQUE_API_VERSION@
 Cflags: -I${includedir}/unique- UNIQUE_API_VERSION@
diff --git a/unique/.gitignore b/unique/.gitignore
index fcb1193..0239cb6 100644
--- a/unique/.gitignore
+++ b/unique/.gitignore
@@ -3,6 +3,7 @@
 Makefile
 Makefile.in
 libunique-dbus-1.0.la
+libunique-dbus-3.0.la
 stamp-uniquemarshal.h
 uniqueapp.lo
 uniqueapp.o
@@ -16,3 +17,4 @@ uniquemessage.lo
 uniquemessage.o
 uniqueversion.h
 libunique-1.0.la
+libunique-3.0.la
diff --git a/unique/Makefile.am b/unique/Makefile.am
index 6475a87..c818386 100644
--- a/unique/Makefile.am
+++ b/unique/Makefile.am
@@ -72,7 +72,7 @@ if HAVE_DBUS
 unique_backend_libs += $(top_builddir)/unique/dbus/libunique-dbus.la
 endif
 
-uniquedir = $(includedir)/unique-1.0/unique
+uniquedir = $(includedir)/unique-3.0/unique
 unique_HEADERS = \
 	$(unique_sources_h) 				\
 	$(top_builddir)/unique/uniqueenumtypes.h	\
@@ -80,19 +80,19 @@ unique_HEADERS = \
 	$(top_srcdir)/unique/unique.h			\
 	$(NULL)
 
-lib_LTLIBRARIES = libunique-1.0.la
+lib_LTLIBRARIES = libunique-3.0.la
 
-libunique_1_0_la_SOURCES = 		\
+libunique_3_0_la_SOURCES = 		\
 	$(unique_sources_c) 		\
 	$(unique_sources_priv_h) 	\
 	$(BUILT_SOURCES)
 
-libunique_1_0_la_LIBADD = 		\
+libunique_3_0_la_LIBADD = 		\
 	$(unique_backend_libs) 		\
 	$(UNIQUE_LIBS)			\
 	$(DBUS_LIBS)
 
-libunique_1_0_la_LDFLAGS = 			\
+libunique_3_0_la_LDFLAGS = 			\
 	-version-info $(UNIQUE_LT_VERSION_INFO)	\
 	-export-dynamic				\
 	-export-symbols-regex "^unique.*"	\
@@ -106,14 +106,14 @@ EXTRA_DIST += uniqueversion.h.in
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
-Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la
+Unique-3.0.gir: $(INTROSPECTION_SCANNER) libunique-3.0.la
 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
-		--namespace Unique --nsversion=1.0 \
+		--namespace Unique --nsversion=3.0 \
 		$(INCLUDES) $(AM_CPPFLAGS) \
 		--c-include='unique/unique.h' \
 		--include=GObject-2.0 \
 		--include=Gtk-2.0 \
-		--library=libunique-1.0.la \
+		--library=libunique-3.0.la \
 		--libtool="$(top_builddir)/libtool" \
 		--pkg gobject-2.0 \
 		--pkg gtk+-2.0 \
@@ -121,7 +121,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la
 		$(unique_sources_h) \
 		$(unique_sources_c)
 
-BUILT_GIRSOURCES += Unique-1.0.gir
+BUILT_GIRSOURCES += Unique-3.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(BUILT_GIRSOURCES)