Merge lp:~docky-core/plank/gtk3 into lp:plank

[Rico Tzschichholz]

[Rico Tzschichholz (ricotz)]

It doesnt interfere with the current gtk+2.0 code and therefore doesnt change the current process for the default build.

review: Approve

[lp:~docky-core/plank/gtk3]

492. By Robert Dyer on 2012-02-28

merge trunk

493. By Robert Dyer on 2012-02-28

update copyrights and cleanup code

[Robert Dyer (psybers)]

Switch to GTK3 as default and I approve.

review: Approve

[lp:~docky-core/plank/gtk3]

494. By Rico Tzschichholz on 2012-02-28

Make gtk+3.0 the default build and switch the conditional code paths.

Library names are preserved to convient reasons and they are a better fit
to the build dependencies.

=== modified file '.bzrignore'
--- .bzrignore	2012-01-07 14:17:43 +0000
+++ .bzrignore	2012-02-28 16:22:32 +0000
@@ -28,6 +28,7 @@
 Makefile
 Makefile.in
 .version
+*.2.vala
 po/*.gmo
 po/.intltool-merge-cache
 po/Makefile.in.in

=== modified file 'configure.ac'
--- configure.ac	2012-01-07 14:17:43 +0000
+++ configure.ac	2012-02-28 16:22:32 +0000
@@ -68,28 +68,60 @@
 API_VERSION=0.2
 AC_SUBST([API_VERSION])
 
+
+# -----------------------------------------------------------
+# Use GTK+2.0 (default is GTK+3.0)
+# -----------------------------------------------------------
+AC_ARG_WITH([gtk2],
+            [AS_HELP_STRING([--with-gtk2],
+            [Use GTK+ version 2 @<:@default=no@:>@])],
+            [],
+            [with_gtk2=no])
+
+AM_CONDITIONAL(USE_GTK2, [test "x$with_gtk2" = "xyes"])
+
+
 # -----------------------------------------------------------
 # Dependencies
 # -----------------------------------------------------------
-GTK_MIN_VERSION=2.22.0
-GLIB_MIN_VERSION=2.26.0
-VALA_MIN_VERSION=0.10.0
-VALADOC_MIN_VERSION=0.3.1
-BAMF_MIN_VERSION=0.2.58
-
-PKG_CHECK_MODULES(PLANK_CORE, gobject-2.0 >= $GLIB_MIN_VERSION
-                              glib-2.0 >= $GLIB_MIN_VERSION
-                              gthread-2.0 >= $GLIB_MIN_VERSION
-                              gio-2.0 >= $GLIB_MIN_VERSION
-                              gio-unix-2.0 >= $GLIB_MIN_VERSION
-                              gtk+-2.0 >= $GTK_MIN_VERSION
-                              gdk-x11-2.0 >= $GTK_MIN_VERSION
-                              libbamf >= $BAMF_MIN_VERSION
-                              gee-1.0
-                              libwnck-1.0
-                              unique-1.0
-                              x11
-)
+if test "x$with_gtk2" = "xyes"; then
+    GTK_MIN_VERSION=2.22.0
+    GLIB_MIN_VERSION=2.26.0
+    VALA_MIN_VERSION=0.10.0
+    VALADOC_MIN_VERSION=0.3.1
+    BAMF_MIN_VERSION=0.2.58
+else
+    GTK_MIN_VERSION=3.0.0
+    GLIB_MIN_VERSION=2.28.0
+    VALA_MIN_VERSION=0.14.1
+    VALADOC_MIN_VERSION=0.3.1
+    BAMF_MIN_VERSION=0.2.92
+fi
+
+PLANK_CORE_PKGS="gobject-2.0 >= $GLIB_MIN_VERSION \
+                 glib-2.0 >= $GLIB_MIN_VERSION \
+                 gthread-2.0 >= $GLIB_MIN_VERSION \
+                 gio-2.0 >= $GLIB_MIN_VERSION \
+                 gio-unix-2.0 >= $GLIB_MIN_VERSION \
+                 gee-1.0 \
+                 x11"
+
+if test "x$with_gtk2" = "xyes"; then
+    PLANK_CORE_PKGS="$PLANK_CORE_PKGS \
+                     gtk+-2.0 >= $GTK_MIN_VERSION \
+                     gdk-x11-2.0 >= $GTK_MIN_VERSION \
+                     libbamf >= $BAMF_MIN_VERSION \
+                     libwnck-1.0 \
+                     unique-1.0"
+else
+    PLANK_CORE_PKGS="$PLANK_CORE_PKGS \
+                     gtk+-3.0 >= $GTK_MIN_VERSION \
+                     gdk-x11-3.0 >= $GTK_MIN_VERSION \
+                     libbamf3 >= $BAMF_MIN_VERSION \
+                     libwnck-3.0"
+fi
+
+PKG_CHECK_MODULES(PLANK_CORE, $PLANK_CORE_PKGS)
 
 #
 # Vala building options -- allows tarball builds without installing Vala
@@ -128,7 +160,8 @@
 # Force Vala if generated source is missing or outdated
 if test \
     ! -e ${srcdir}/lib/libplank_la_vala.stamp -o \
-    ! -e ${srcdir}/src/plank_vala.stamp ; then
+    ! -e ${srcdir}/lib/libplank3_la_vala.stamp -o \
+    ! -e ${srcdir}/src/plank_vala.stamp; then
     enable_vala=yes
     echo "Vala source needs to be re-compiled; requiring Vala..."
 fi
@@ -144,22 +177,29 @@
         AC_MSG_ERROR([Vala must be built with --enable-vapigen])
     fi
 
-    PLANK_CORE_VALA_PKGS="--pkg gdk-x11-2.0 \
-                          --pkg gtk+-2.0 \
-                          --pkg gio-unix-2.0 \
+    PLANK_CORE_COMMON_VALA_PKGS="--pkg gio-unix-2.0 \
+                                 --pkg gee-1.0 \
+                                 --pkg posix \
+                                 --pkg x11"
+
+    PLANK_CORE_2_VALA_PKGS="--pkg gtk+-2.0 \
+                            --pkg gdk-x11-2.0 \
+                            --pkg bamf \
+                            --pkg libwnck-1.0 \
+                            --pkg unique-1.0"
+    VALAFLAGS_2="$VALAFLAGS --thread --target-glib=2.26 --define=USE_GTK2"
+
+    PLANK_CORE_VALA_PKGS="--pkg gtk+-3.0 \
+                          --pkg gdk-x11-3.0 \
                           --pkg bamf \
-                          --pkg gee-1.0 \
-                          --pkg libwnck-1.0 \
-                          --pkg posix \
-                          --pkg unique-1.0 \
-                          --pkg x11"
-    AC_SUBST(PLANK_CORE_VALA_PKGS)
-
-    VALAFLAGS="$VALAFLAGS --thread --target-glib=2.26"
-    AC_SUBST(VALAFLAGS)
-
-    PLANK_CORE_VALAFLAGS="$VALAFLAGS $PLANK_CORE_VALA_PKGS"
+                          --pkg libwnck-3.0"
+    VALAFLAGS="$VALAFLAGS --thread --target-glib=2.28"
+
+    PLANK_CORE_VALAFLAGS="$VALAFLAGS $PLANK_CORE_COMMON_VALA_PKGS $PLANK_CORE_VALA_PKGS"
     AC_SUBST(PLANK_CORE_VALAFLAGS)
+
+    PLANK_CORE_2_VALAFLAGS="$VALAFLAGS_2 $PLANK_CORE_COMMON_VALA_PKGS $PLANK_CORE_2_VALA_PKGS"
+    AC_SUBST(PLANK_CORE_2_VALAFLAGS)
 fi
 
 # -----------------------------------------------------------
@@ -168,16 +208,16 @@
 AC_ARG_ENABLE([docs],
               AS_HELP_STRING([--enable-docs],[Enable documentation generation]),
               [enable_docs=$enableval], [enable_docs=no])
-AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xyes])
+AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" = "xyes"])
 
 have_valadoc=no
-if test x$enable_docs = xyes; then
+if test "x$enable_docs" = "xyes"; then
     # make sure the library is new enough and the program exists
     PKG_CHECK_MODULES([VALADOC], [valadoc-1.0 >= $VALADOC_MIN_VERSION])
     AC_PATH_PROG([VALADOC], [valadoc], [:])
     AS_IF([test "$VALADOC" != :], have_valadoc=yes)
 fi
-AM_CONDITIONAL([HAVE_VALADOC], [test x$have_valadoc = xyes])
+AM_CONDITIONAL([HAVE_VALADOC], [test "x$have_valadoc" = "xyes"])
 
 if test "x$enable_docs" = "xyes" -a "x$have_valadoc" != "xyes"; then
     AC_MSG_ERROR([Doc building requested but valadoc not installed.])
@@ -221,6 +261,7 @@
 data/themes/Transparent/Makefile
 lib/Makefile
 lib/libplank.pc
+lib/libplank3.pc
 man/Makefile
 src/Makefile
 docs/Makefile
@@ -234,6 +275,7 @@
 ${PACKAGE} ${VERSION}
 
     Prefix......................:  ${prefix}
+    Use GTK+2.0 ................:  ${with_gtk2}
     Vala........................:  ${enable_vala}
     Vala Compiler...............:  ${VALAC}
     Vala Flags..................:  ${VALAFLAGS}

=== modified file 'docs/Makefile.am'
--- docs/Makefile.am	2012-02-11 12:45:57 +0000
+++ docs/Makefile.am	2012-02-28 16:22:32 +0000
@@ -1,3 +1,9 @@
+if USE_GTK2
+SUFFIX=
+else
+SUFFIX=3
+endif
+
 distclean_dirs = \
 	plank \
 	gtk-doc \
@@ -52,20 +58,31 @@
 	$(NULL)
 
 plank_doc_deps = \
+	bamf \
+	gee-1.0 \
+	gio-unix-2.0 \
+	posix \
+	x11 \
+	$(NULL)
+
+if USE_GTK2
+plank_doc_deps += \
 	gdk-x11-2.0 \
 	gtk+-2.0 \
-	gio-unix-2.0 \
-	bamf \
-	gee-1.0 \
 	libwnck-1.0 \
-	posix \
 	unique-1.0 \
-	x11 \
-	$(NULL)
+	$(NULL)
+else
+plank_doc_deps += \
+	gdk-x11-3.0 \
+	gtk+-3.0 \
+	libwnck-3.0 \
+	$(NULL)
+endif
 
 valadoc_flags_plank = \
 	$(valadoc_flags) \
-	-X $(top_srcdir)/lib/plank.h \
+	-X $(top_srcdir)/lib/plank$(SUFFIX).h \
 	$(addprefix --pkg=,$(plank_doc_deps)) \
 	--vapidir=$(top_srcdir)/lib \
 	--vapidir=$(top_srcdir)/vapi \
@@ -81,7 +98,7 @@
 
 plank-gtk-doc: $(plank_doc_files)
 	$(AM_V_GEN)$(VALADOC) \
-		-X -l -X $(top_builddir)/lib/.libs/libplank.so \
+		-X -l -X $(top_builddir)/lib/.libs/libplank$(SUFFIX).so \
 		-o gtk-doc/plank \
 		--doclet=gtkdoc \
 		$(valadoc_flags_plank) \

=== modified file 'lib/Factories/AbstractMain.vala'
--- lib/Factories/AbstractMain.vala	2012-02-16 10:42:10 +0000
+++ lib/Factories/AbstractMain.vala	2012-02-28 16:22:32 +0000
@@ -16,7 +16,9 @@
 // 
 
 using Gtk;
+#if USE_GTK2
 using Unique;
+#endif
 using Posix;
 
 using Plank.Services;
@@ -266,7 +268,12 @@
 			Gtk.init (ref args);
 			
 			// ensure only one instance per dock_path
-			if (new App (app_dbus + "." + dock_path, null).is_running)
+			var path = app_dbus + "." + dock_path;
+#if USE_GTK2
+			if (new App (path, null).is_running)
+#else
+			if (new Gtk.Application (path, ApplicationFlags.IS_LAUNCHER).is_registered)
+#endif
 				error ("Exiting because another instance of this application is already running with the name '%s'.".printf (dock_path));
 			
 			return args;
@@ -343,7 +350,11 @@
 		public virtual void show_about ()
 		{
 			if (about_dlg != null) {
+#if USE_GTK2
 				about_dlg.window.raise ();
+#else
+				about_dlg.show_all ();
+#endif
 				return;
 			}
 			
@@ -364,7 +375,11 @@
 			about_dlg.set_translator_credits (about_translators);
 			
 			about_dlg.response.connect (() => {
+#if USE_GTK2
 				about_dlg.hide_all ();
+#else
+				about_dlg.hide ();
+#endif
 			});
 			about_dlg.hide.connect (() => {
 				about_dlg.destroy ();

=== modified file 'lib/HideManager.vala'
--- lib/HideManager.vala	2012-02-09 03:49:46 +0000
+++ lib/HideManager.vala	2012-02-28 16:22:32 +0000
@@ -120,7 +120,13 @@
 		{
 			// get current mouse pointer location
 			int x, y;
-			controller.window.get_display ().get_pointer (null, out x, out y, null);
+			
+			controller.window.get_display ().
+#if USE_GTK2
+				get_pointer (null, out x, out y, null);
+#else
+				get_device_manager ().get_client_pointer ().get_position (null, out x, out y);
+#endif
 			
 			// get window location
 			var win_x = controller.position_manager.win_x;

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2012-02-05 09:37:41 +0000
+++ lib/Makefile.am	2012-02-28 16:22:32 +0000
@@ -2,45 +2,52 @@
 
 VAPIDIR = $(top_srcdir)/vapi
 
-libplankincludedir = $(includedir)/plank
-libplankinclude_HEADERS = plank.h
+if USE_GTK2
+SUFFIX=
+lib_LTLIBRARIES = libplank.la
+else
+SUFFIX=3
+lib_LTLIBRARIES = libplank3.la
+endif
+
+BUILT_SOURCES = libplank$(SUFFIX)_la_vala.stamp
+
+libplankincludedir = $(includedir)/plank$(SUFFIX)
+libplankinclude_HEADERS = plank$(SUFFIX).h
 
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
-	plank.vapi \
-	plank.deps \
+	plank$(SUFFIX).vapi \
+	plank$(SUFFIX).deps \
 	$(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libplank.pc
+pkgconfig_DATA = libplank$(SUFFIX).pc
 
 libplankdir = $(libdir)
 
-BUILT_SOURCES = libplank_la_vala.stamp
-
-lib_LTLIBRARIES = libplank.la
-
-libplank_la_CFLAGS = \
+libplank3_la_CFLAGS = \
 	$(PLANK_CORE_CFLAGS) \
 	-include config.h \
 	-w \
 	$(NULL)
 
-libplank_la_LDFLAGS = \
-	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
+libplank3_la_LDFLAGS = \
+	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
+	-lm \
 	$(PLANK_CORE_LDFLAGS) \
 	$(NULL)
 
-libplank_la_VALAFLAGS = \
+libplank3_la_VALAFLAGS = \
 	$(PLANK_CORE_VALAFLAGS) \
 	--vapidir $(VAPIDIR) \
 	$(NULL)
 
-libplank_la_LIBADD = \
+libplank3_la_LIBADD = \
 	$(PLANK_CORE_LIBS) \
 	$(NULL)
 
-libplank_la_VALASOURCES = \
+libplank3_la_VALASOURCES = \
 	DockController.vala \
 	DockItems.vala \
 	DockPreferences.vala \
@@ -76,6 +83,39 @@
 	Widgets/TitledSeparatorMenuItem.vala \
 	$(NULL)
 
+libplank_la_valasource.stamp: $(libplank3_la_VALASOURCES)
+	for f in $(filter %.vala,$^); do \
+		cd $(abs_srcdir)/$$(dirname $$f); \
+		if test \
+			-f $$(basename $$f .vala).2.vala -a \
+			! -L $$(basename $$f .vala).2.vala; then \
+			rm $$(dirname $$f)/$$(basename $$f .vala).2.vala; fi; \
+		if test \
+			! -e $$(basename $$f .vala).2.vala; then \
+			ln -s $$(basename $$f) $$(basename $$f .vala).2.vala; fi; \
+	done
+	$(AM_V_at)touch $@
+
+libplank_la_VALASOURCES = \
+	libplank_la_valasource.stamp \
+	$(libplank3_la_VALASOURCES:.vala=.2.vala) \
+	$(NULL)
+
+libplank3_la_SOURCES = \
+	libplank3_la_vala.stamp \
+	$(libplank3_la_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+plank3.h plank3.vapi: libplank3_la_vala.stamp
+
+libplank_la_CFLAGS = $(libplank3_la_CFLAGS)
+libplank_la_LDFLAGS = $(libplank3_la_LDFLAGS)
+libplank_la_LIBADD = $(libplank3_la_LIBADD)
+libplank_la_VALAFLAGS = \
+	$(PLANK_CORE_2_VALAFLAGS) \
+	--vapidir $(VAPIDIR) \
+	$(NULL)
+
 libplank_la_SOURCES = \
 	libplank_la_vala.stamp \
 	$(libplank_la_VALASOURCES:.vala=.c) \
@@ -83,7 +123,18 @@
 
 plank.h plank.vapi: libplank_la_vala.stamp
 
-libplank_la_vala.stamp: $(libplank_la_VALASOURCES)
+libplank3_la_vala.stamp: $(libplank3_la_VALASOURCES)
+	$(AM_V_VALA)$(VALAC) \
+		$(libplank3_la_VALAFLAGS) \
+		-C \
+		-H plank3.h \
+		--library plank3 \
+		--symbols libplank3.symbols \
+		--vapi plank3.vapi \
+		$(filter %.vala %.c,$^)
+	$(AM_V_at)touch $@
+
+libplank_la_vala.stamp: libplank_la_valasource.stamp $(libplank_la_VALASOURCES)
 	$(AM_V_VALA)$(VALAC) \
 		$(libplank_la_VALAFLAGS) \
 		-C \
@@ -95,14 +146,29 @@
 	$(AM_V_at)touch $@
 
 DISTCLEANFILES = \
+	libplank_la_valasource.stamp \
+	$(libplank3_la_VALASOURCES) \
+	libplank_la_vala.stamp \
 	$(libplank_la_SOURCES) \
-	libplank_la_vala.stamp \
 	plank.vapi \
 	plank.h \
+	libplank3_la_vala.stamp \
+	$(libplank3_la_SOURCES) \
+	plank3.vapi \
+	plank3.h \
 	$(NULL)
 
 EXTRA_DIST = \
+	libplank_la_valasource.stamp \
+	$(libplank3_la_VALASOURCES) \
 	$(libplank_la_VALASOURCES) \
 	libplank.pc.in \
+	libplank3.pc.in \
+	plank.deps \
+	plank.vapi \
+	plank.h \
+	plank3.deps \
+	plank3.vapi \
+	plank3.h \
 	$(NULL)
 

=== modified file 'lib/Widgets/CompositedWindow.vala'
--- lib/Widgets/CompositedWindow.vala	2011-09-06 20:36:49 +0000
+++ lib/Widgets/CompositedWindow.vala	2012-02-28 16:22:32 +0000
@@ -1,5 +1,5 @@
 //  
-//  Copyright (C) 2011 Robert Dyer
+//  Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
 // 
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -39,17 +39,26 @@
 			resizable = false;
 			double_buffered = false;
 			
-			set_default_colormap (get_screen ().get_rgba_colormap () ?? get_screen ().get_rgb_colormap ());
+			var screen = get_screen ();
+#if USE_GTK2
+			set_default_colormap (screen.get_rgba_colormap () ?? screen.get_rgb_colormap ());
 			
 			realize.connect (() => {
 				get_window ().set_back_pixmap (null, false);
 			});
+#else
+			set_visual (screen.get_rgba_visual () ?? screen.get_system_visual ());
+#endif
 		}
 		
+#if USE_GTK2
 		public override bool expose_event (EventExpose event)
 		{
 			var cr = cairo_create (event.window);
-			
+#else
+		public override bool draw (Cairo.Context cr)
+		{
+#endif
 			cr.set_operator (Cairo.Operator.CLEAR);
 			cr.rectangle (0, 0, width_request, height_request);
 			cr.fill ();

=== modified file 'lib/Widgets/DockWindow.vala'
--- lib/Widgets/DockWindow.vala	2012-02-15 02:14:08 +0000
+++ lib/Widgets/DockWindow.vala	2012-02-28 16:22:32 +0000
@@ -178,8 +178,14 @@
 		/**
 		 * {@inheritDoc}
 		 */
+#if USE_GTK2
 		public override bool expose_event (EventExpose event)
 		{
+			var cr = cairo_create (event.window);
+#else
+		public override bool draw (Context cr)
+		{
+#endif
 			if (dock_is_starting) {
 				debug ("dock window loaded");
 				dock_is_starting = false;
@@ -192,7 +198,7 @@
 			}
 			
 			set_input_mask ();
-			controller.renderer.draw_dock (cairo_create (event.window));
+			controller.renderer.draw_dock (cr);
 			
 			return true;
 		}
@@ -389,7 +395,11 @@
 		
 		void set_input_mask ()
 		{
+#if USE_GTK2
 			if (!is_realized ())
+#else
+			if (!get_realized ())
+#endif
 				return;
 			
 			var cursor = controller.position_manager.get_cursor_region ();
@@ -397,13 +407,21 @@
 			return_if_fail (cursor.width > 0);
 			return_if_fail (cursor.height > 0);
 			
+#if USE_GTK2
 			var region = Gdk.Region.rectangle (Gdk.Rectangle () {x = 0, y = 0, width = cursor.width, height = cursor.height});
+#else
+			var region = new Region.rectangle (RectangleInt () {x = 0, y = 0, width = cursor.width, height = cursor.height});
+#endif
 			get_window ().input_shape_combine_region (region, cursor.x, cursor.y);
 		}
 		
 		void set_struts ()
 		{
+#if USE_GTK2
 			if (!is_realized ())
+#else
+			if (!get_realized ())
+#endif
 				return;
 			
 			var struts = new ulong [Struts.N_VALUES];
@@ -415,8 +433,13 @@
 			for (var i = 0; i < first_struts.length; i++)
 				first_struts [i] = struts [i];
 			
+#if USE_GTK2
 			unowned X.Display display = x11_drawable_get_xdisplay (get_window ());
 			var xid = x11_drawable_get_xid (get_window ());
+#else
+			unowned X.Display display = X11Display.get_xdisplay (get_display ());
+			var xid = X11Window.get_xid (get_window ());
+#endif
 			
 			Gdk.error_trap_push ();
 			display.change_property (xid, display.intern_atom ("_NET_WM_STRUT_PARTIAL", false), X.XA_CARDINAL,

=== modified file 'lib/Widgets/HoverWindow.vala'
--- lib/Widgets/HoverWindow.vala	2012-02-08 20:58:41 +0000
+++ lib/Widgets/HoverWindow.vala	2012-02-28 16:22:32 +0000
@@ -158,6 +158,9 @@
 			text_offset = buffer / 2;
 			
 			set_size_request (int.max (HOVER_HEIGHT, buffer + logical_rect.width), HOVER_HEIGHT);
+#if !USE_GTK2
+			queue_resize ();
+#endif
 		}
 		
 		void draw_background ()
@@ -173,13 +176,17 @@
 			Pango.cairo_show_layout (background_buffer.Context, layout);
 		}
 		
+#if USE_GTK2
 		public override bool expose_event (EventExpose event)
 		{
+			var cr = cairo_create (event.window);
+#else
+		public override bool draw (Cairo.Context cr)
+		{
+#endif
 			if (background_buffer == null || background_buffer.Height != height_request || background_buffer.Width != width_request)
 				draw_background ();
 			
-			var cr = cairo_create (event.window);
-			
 			cr.set_operator (Operator.SOURCE);
 			cr.set_source_surface (background_buffer.Internal, 0, 0);
 			cr.paint ();

=== modified file 'lib/Widgets/PoofWindow.vala'
--- lib/Widgets/PoofWindow.vala	2011-09-07 09:12:27 +0000
+++ lib/Widgets/PoofWindow.vala	2012-02-28 16:22:32 +0000
@@ -1,5 +1,5 @@
 //  
-//  Copyright (C) 2011 Robert Dyer
+//  Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
 // 
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -79,10 +79,14 @@
 			return double.max (0, double.min (1, (double) new DateTime.now_utc ().difference (start_time) / RUN_LENGTH));
 		}
 		
+#if USE_GTK2
 		public override bool expose_event (EventExpose event)
 		{
 			var cr = cairo_create (event.window);
-			
+#else
+		public override bool draw (Cairo.Context cr)
+		{
+#endif
 			cr.set_operator (Operator.SOURCE);
 			cr.set_source_rgba (0, 0, 0, 0);
 			cr.paint ();

=== modified file 'lib/Widgets/TitledSeparatorMenuItem.vala'
--- lib/Widgets/TitledSeparatorMenuItem.vala	2011-09-06 20:36:49 +0000
+++ lib/Widgets/TitledSeparatorMenuItem.vala	2012-02-28 16:22:32 +0000
@@ -1,6 +1,6 @@
 //
 //  Copyright (C) 2010 Michal Hruby <[e-mail]>
-//  Copyright (C) 2011 Robert Dyer
+//  Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 //  Authored by Michal Hruby <[e-mail]>
-//  Modified by Robert Dyer
+//  Modified by Robert Dyer, Rico Tzschichholz
 //
 
 using Cairo;
@@ -47,8 +47,14 @@
 			draw_line = false;
 		}
 		
+#if USE_GTK2
 		protected override bool expose_event (Gdk.EventExpose event)
 		{
+			var cr = cairo_create (event.window);
+#else
+		protected override bool draw (Cairo.Context cr)
+		{
+#endif
 			Gtk.Allocation alloc;
 			get_allocation (out alloc);
 			
@@ -67,15 +73,25 @@
 				var ythickness = style.ythickness;
 				
 				if (wide_separators)
-					Gtk.paint_box (style, get_window (), StateType.NORMAL,
-						ShadowType.ETCHED_OUT, event.area, this, "hseparator",
+					Gtk.paint_box (style,
+#if USE_GTK2
+						get_window (), StateType.NORMAL, ShadowType.ETCHED_OUT, event.area,
+#else
+						cr, StateType.NORMAL, ShadowType.ETCHED_OUT,
+#endif
+						this, "hseparator",
 						alloc.x + horizontal_padding + xthickness,
 						alloc.y + (alloc.height - separator_height - ythickness)/2,
 						alloc.width - 2 * (horizontal_padding + xthickness),
 						separator_height);
 				else
-					Gtk.paint_hline (style, get_window (), StateType.NORMAL,
-						event.area, this, "menuitem",
+					Gtk.paint_hline (style,
+#if USE_GTK2
+						get_window (), StateType.NORMAL, event.area,
+#else
+						cr, StateType.NORMAL,
+#endif
+						this, "menuitem",
 						alloc.x + horizontal_padding + xthickness,
 						alloc.x + alloc.width - horizontal_padding - xthickness - 1,
 						alloc.y + (alloc.height - ythickness) / 2);
@@ -93,13 +109,16 @@
 			Pango.Rectangle ink_rect, logical_rect;
 			layout.get_pixel_extents (out ink_rect, out logical_rect);
 			
-			Gtk.paint_flat_box (parent.get_style (), get_window (),
-				StateType.NORMAL, ShadowType.NONE,
-				null, this, null,
+			Gtk.paint_flat_box (parent.get_style (),
+#if USE_GTK2
+				get_window (), StateType.NORMAL, ShadowType.NONE, null,
+#else
+				cr, StateType.NORMAL, ShadowType.NONE,
+#endif
+				this, null,
 				0, alloc.y,
 				alloc.x + logical_rect.width + 2 * horizontal_padding, alloc.height);
 			
-			var cr = cairo_create (event.window);
 			var color = style.fg[StateType.NORMAL];
 			
 			cr.move_to (alloc.x + horizontal_padding, alloc.y + (alloc.height - logical_rect.height) / 2);

=== added file 'lib/libplank3.pc.in'
--- lib/libplank3.pc.in	1970-01-01 00:00:00 +0000
+++ lib/libplank3.pc.in	2012-02-28 16:22:32 +0000
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libplank
+Description: Generic dock library of Plank 
+Version: @PACKAGE_VERSION@
+Requires: cairo gee-1.0 glib-2.0 gio-2.0 gobject-2.0 gdk-3.0 gdk-pixbuf-2.0 gtk+-3.0
+Libs: -L${libdir} -lplank
+Cflags: -I${includedir}/plank

=== added file 'lib/libplank3.symbols'
--- lib/libplank3.symbols	1970-01-01 00:00:00 +0000
+++ lib/libplank3.symbols	2012-02-28 16:22:32 +0000
@@ -0,0 +1,396 @@
+plank_dock_controller_get_type
+plank_services_preferences_get_type
+plank_dock_preferences_get_type
+plank_dock_items_get_type
+plank_position_manager_get_type
+plank_drawing_animated_renderer_get_type
+plank_dock_renderer_get_type
+plank_hide_manager_get_type
+plank_widgets_composited_window_get_type
+plank_widgets_hover_window_get_type
+plank_widgets_dock_window_get_type
+plank_dock_controller_new
+plank_dock_controller_construct
+plank_items_dock_item_get_type
+plank_dock_items_new
+plank_dock_items_construct
+plank_dock_items_add_item
+plank_dock_items_remove_item
+plank_dock_preferences_new
+plank_dock_preferences_construct
+plank_dock_preferences_new_with_file
+plank_dock_preferences_construct_with_file
+plank_dock_preferences_increase_icon_size
+plank_dock_preferences_decrease_icon_size
+plank_dock_preferences_is_horizontal_dock
+plank_dock_preferences_get_IconSize
+plank_dock_preferences_set_IconSize
+plank_hide_type_get_type
+plank_dock_preferences_get_HideMode
+plank_dock_preferences_set_HideMode
+plank_dock_preferences_get_UnhideDelay
+plank_dock_preferences_set_UnhideDelay
+plank_dock_preferences_get_Monitor
+plank_dock_preferences_set_Monitor
+plank_dock_preferences_get_Position
+plank_dock_preferences_set_Position
+plank_dock_preferences_get_Offset
+plank_dock_preferences_set_Offset
+plank_dock_renderer_get_hide_offset
+plank_dock_renderer_new
+plank_dock_renderer_construct
+plank_dock_renderer_initialize
+plank_dock_renderer_show
+plank_dock_renderer_hide
+plank_dock_renderer_reset_buffers
+plank_dock_renderer_draw_dock
+plank_dock_renderer_get_Hidden
+plank_hide_manager_new
+plank_hide_manager_construct
+plank_hide_manager_initialize
+plank_hide_manager_update_dock_hovered
+plank_hide_manager_get_DockHovered
+plank_hide_manager_set_DockHovered
+plank_position_manager_new
+plank_position_manager_construct
+plank_position_manager_initialize
+plank_drawing_theme_renderer_get_type
+plank_drawing_dock_theme_renderer_get_type
+plank_position_manager_reset_caches
+plank_position_manager_get_cursor_region
+plank_position_manager_get_static_dock_region
+plank_position_manager_update_regions
+plank_position_manager_item_draw_region
+plank_position_manager_item_hover_region
+plank_position_manager_get_menu_position
+plank_position_manager_get_hover_position
+plank_position_manager_update_dock_position
+plank_position_manager_get_struts
+plank_position_manager_get_win_x
+plank_position_manager_set_win_x
+plank_position_manager_get_win_y
+plank_position_manager_set_win_y
+plank_position_manager_get_IndicatorSize
+plank_position_manager_get_GlowSize
+plank_position_manager_get_HorizPadding
+plank_position_manager_get_TopPadding
+plank_position_manager_get_BottomPadding
+plank_position_manager_get_ItemPadding
+plank_position_manager_get_VisibleDockHeight
+plank_position_manager_get_DockHeight
+plank_position_manager_get_DockBackgroundHeight
+plank_position_manager_get_VisibleDockWidth
+plank_position_manager_get_DockWidth
+plank_position_manager_get_DockBackgroundWidth
+plank_drawing_animated_renderer_construct
+plank_drawing_animated_renderer_construct_with_widget
+plank_drawing_animated_renderer_set_widget
+plank_drawing_animated_renderer_animation_needed
+plank_drawing_animated_renderer_animated_draw
+plank_services_prefs_serializable_get_type
+plank_drawing_color_get_type
+plank_drawing_color_new
+plank_drawing_color_construct
+plank_drawing_color_new_from_gdk
+plank_drawing_color_construct_from_gdk
+plank_drawing_color_set_hue
+plank_drawing_color_set_sat
+plank_drawing_color_set_val
+plank_drawing_color_set_alpha
+plank_drawing_color_get_hue
+plank_drawing_color_get_sat
+plank_drawing_color_get_val
+plank_drawing_color_add_hue
+plank_drawing_color_set_min_sat
+plank_drawing_color_set_min_value
+plank_drawing_color_set_max_sat
+plank_drawing_color_set_max_val
+plank_drawing_color_multiply_sat
+plank_drawing_color_brighten_val
+plank_drawing_color_darken_val
+plank_drawing_color_darken_by_sat
+plank_drawing_drawing_service_get_type
+plank_drawing_drawing_service_get_icon_from_file
+plank_drawing_drawing_service_get_icon_from_gicon
+plank_drawing_drawing_service_load_icon
+plank_drawing_drawing_service_ar_scale
+plank_drawing_drawing_service_average_color
+plank_drawing_drawing_service_new
+plank_drawing_drawing_service_construct
+plank_drawing_dock_surface_get_type
+plank_drawing_dock_surface_new
+plank_drawing_dock_surface_construct
+plank_drawing_dock_surface_new_with_surface
+plank_drawing_dock_surface_construct_with_surface
+plank_drawing_dock_surface_new_with_dock_surface
+plank_drawing_dock_surface_construct_with_dock_surface
+plank_drawing_dock_surface_clear
+plank_drawing_dock_surface_load_to_pixbuf
+plank_drawing_dock_surface_average_color
+plank_drawing_dock_surface_fast_blur
+plank_drawing_dock_surface_exponential_blur
+plank_drawing_dock_surface_gaussian_blur
+plank_drawing_dock_surface_get_Internal
+plank_drawing_dock_surface_get_Width
+plank_drawing_dock_surface_get_Height
+plank_drawing_dock_surface_get_Context
+plank_drawing_dock_theme_renderer_create_indicator
+plank_drawing_dock_theme_renderer_create_urgent_glow
+plank_drawing_dock_theme_renderer_draw_active_glow
+plank_drawing_dock_theme_renderer_draw_badge
+plank_drawing_dock_theme_renderer_new
+plank_drawing_dock_theme_renderer_construct
+plank_drawing_dock_theme_renderer_get_HorizPadding
+plank_drawing_dock_theme_renderer_set_HorizPadding
+plank_drawing_dock_theme_renderer_get_TopPadding
+plank_drawing_dock_theme_renderer_set_TopPadding
+plank_drawing_dock_theme_renderer_get_BottomPadding
+plank_drawing_dock_theme_renderer_set_BottomPadding
+plank_drawing_dock_theme_renderer_get_ItemPadding
+plank_drawing_dock_theme_renderer_set_ItemPadding
+plank_drawing_dock_theme_renderer_get_IndicatorSize
+plank_drawing_dock_theme_renderer_set_IndicatorSize
+plank_drawing_dock_theme_renderer_get_UrgentBounceHeight
+plank_drawing_dock_theme_renderer_set_UrgentBounceHeight
+plank_drawing_dock_theme_renderer_get_LaunchBounceHeight
+plank_drawing_dock_theme_renderer_set_LaunchBounceHeight
+plank_drawing_dock_theme_renderer_get_FadeOpacity
+plank_drawing_dock_theme_renderer_set_FadeOpacity
+plank_drawing_dock_theme_renderer_get_ClickTime
+plank_drawing_dock_theme_renderer_set_ClickTime
+plank_drawing_dock_theme_renderer_get_UrgentBounceTime
+plank_drawing_dock_theme_renderer_set_UrgentBounceTime
+plank_drawing_dock_theme_renderer_get_LaunchBounceTime
+plank_drawing_dock_theme_renderer_set_LaunchBounceTime
+plank_drawing_dock_theme_renderer_get_ActiveTime
+plank_drawing_dock_theme_renderer_set_ActiveTime
+plank_drawing_dock_theme_renderer_get_SlideTime
+plank_drawing_dock_theme_renderer_set_SlideTime
+plank_drawing_dock_theme_renderer_get_FadeTime
+plank_drawing_dock_theme_renderer_set_FadeTime
+plank_drawing_dock_theme_renderer_get_HideTime
+plank_drawing_dock_theme_renderer_set_HideTime
+plank_drawing_dock_theme_renderer_get_GlowSize
+plank_drawing_dock_theme_renderer_set_GlowSize
+plank_drawing_dock_theme_renderer_get_GlowTime
+plank_drawing_dock_theme_renderer_set_GlowTime
+plank_drawing_dock_theme_renderer_get_GlowPulseTime
+plank_drawing_dock_theme_renderer_set_GlowPulseTime
+plank_drawing_hover_theme_renderer_get_type
+plank_drawing_hover_theme_renderer_new
+plank_drawing_hover_theme_renderer_construct
+plank_drawing_theme_renderer_new
+plank_drawing_theme_renderer_construct
+plank_drawing_theme_renderer_load
+plank_drawing_theme_renderer_get_top_offset
+plank_drawing_theme_renderer_get_bottom_offset
+plank_drawing_theme_renderer_draw_background
+plank_drawing_theme_renderer_draw_inner_rect
+plank_drawing_theme_renderer_draw_rounded_rect
+plank_drawing_theme_renderer_get_TopRoundness
+plank_drawing_theme_renderer_set_TopRoundness
+plank_drawing_theme_renderer_get_BottomRoundness
+plank_drawing_theme_renderer_set_BottomRoundness
+plank_drawing_theme_renderer_get_LineWidth
+plank_drawing_theme_renderer_set_LineWidth
+plank_drawing_theme_renderer_get_OuterStrokeColor
+plank_drawing_theme_renderer_set_OuterStrokeColor
+plank_drawing_theme_renderer_get_FillStartColor
+plank_drawing_theme_renderer_set_FillStartColor
+plank_drawing_theme_renderer_get_FillEndColor
+plank_drawing_theme_renderer_set_FillEndColor
+plank_drawing_theme_renderer_get_InnerStrokeColor
+plank_drawing_theme_renderer_set_InnerStrokeColor
+plank_factories_abstract_main_get_type
+plank_factories_abstract_main_start
+plank_factories_abstract_main_initialize_program
+plank_factories_abstract_main_parse_commandline
+plank_factories_abstract_main_set_options
+plank_factories_abstract_main_initialize_libraries
+plank_factories_abstract_main_initialize_services
+plank_factories_abstract_main_create_controller
+plank_factories_abstract_main_is_launcher_for_dock
+plank_factories_abstract_main_help
+plank_factories_abstract_main_translate
+plank_factories_abstract_main_quit
+plank_factories_abstract_main_on_item_clicked
+plank_factories_abstract_main_show_about
+plank_factories_abstract_main_construct
+plank_factories_factory_get_type
+plank_factories_item_factory_get_type
+plank_factories_factory_init
+plank_factories_factory_new
+plank_factories_factory_construct
+plank_factories_item_factory_make_item
+plank_factories_item_factory_default_make_item
+plank_factories_item_factory_get_launcher_from_dockitem
+plank_factories_item_factory_make_default_items
+plank_factories_item_factory_make_dock_item
+plank_factories_item_factory_new
+plank_factories_item_factory_construct
+plank_items_popup_button_get_type
+plank_items_click_animation_get_type
+plank_items_application_dock_item_get_type
+plank_items_application_dock_item_new_with_dockitem
+plank_items_application_dock_item_construct_with_dockitem
+plank_items_application_dock_item_load_from_launcher
+plank_items_application_dock_item_parse_launcher
+plank_items_application_dock_item_new
+plank_items_application_dock_item_construct
+plank_items_indicator_state_get_type
+plank_items_item_state_get_type
+plank_items_popup_button_from_event_button
+plank_items_dock_item_new
+plank_items_dock_item_construct
+plank_items_dock_item_handle_deleted
+plank_items_dock_item_delete
+plank_items_dock_item_reset_icon_buffer
+plank_items_dock_item_get_surface
+plank_items_dock_item_draw_icon
+plank_items_dock_item_clicked
+plank_items_dock_item_on_clicked
+plank_items_dock_item_scrolled
+plank_items_dock_item_on_scrolled
+plank_items_dock_item_get_menu_items
+plank_items_dock_item_unique_id
+plank_items_dock_item_as_uri
+plank_items_dock_item_create_menu_item
+plank_items_dock_item_get_Icon
+plank_items_dock_item_set_Icon
+plank_items_dock_item_get_ForcePixbuf
+plank_items_dock_item_set_ForcePixbuf
+plank_items_dock_item_get_Text
+plank_items_dock_item_set_Text
+plank_items_dock_item_get_BadgeText
+plank_items_dock_item_set_BadgeText
+plank_items_dock_item_get_Position
+plank_items_dock_item_set_Position
+plank_items_dock_item_get_Button
+plank_items_dock_item_set_Button
+plank_items_dock_item_get_State
+plank_items_dock_item_set_State
+plank_items_dock_item_get_Indicator
+plank_items_dock_item_set_Indicator
+plank_items_dock_item_get_ClickedAnimation
+plank_items_dock_item_set_ClickedAnimation
+plank_items_dock_item_get_AddTime
+plank_items_dock_item_set_AddTime
+plank_items_dock_item_get_RemoveTime
+plank_items_dock_item_set_RemoveTime
+plank_items_dock_item_get_LastClicked
+plank_items_dock_item_set_LastClicked
+plank_items_dock_item_get_LastScrolled
+plank_items_dock_item_set_LastScrolled
+plank_items_dock_item_get_LastUrgent
+plank_items_dock_item_set_LastUrgent
+plank_items_dock_item_get_LastActive
+plank_items_dock_item_set_LastActive
+plank_items_dock_item_get_ValidItem
+plank_items_dock_item_get_AverageIconColor
+plank_items_dock_item_set_AverageIconColor
+plank_items_dock_item_get_Launcher
+plank_items_dock_item_get_Sort
+plank_items_dock_item_set_Sort
+plank_items_dock_item_preferences_get_type
+plank_items_dock_item_get_Prefs
+plank_items_dock_item_set_Prefs
+plank_items_dock_item_preferences_new_with_file
+plank_items_dock_item_preferences_construct_with_file
+plank_items_dock_item_preferences_new
+plank_items_dock_item_preferences_construct
+plank_items_dock_item_preferences_get_Launcher
+plank_items_dock_item_preferences_set_Launcher
+plank_items_dock_item_preferences_get_Sort
+plank_items_dock_item_preferences_set_Sort
+plank_items_file_dock_item_get_type
+plank_items_file_dock_item_new_with_dockitem
+plank_items_file_dock_item_construct_with_dockitem
+plank_items_file_dock_item_launch
+plank_items_file_dock_item_new
+plank_items_file_dock_item_construct
+plank_items_plank_dock_item_get_type
+plank_items_plank_dock_item_new_with_dockitem
+plank_items_plank_dock_item_construct_with_dockitem
+plank_items_plank_dock_item_get_plank_menu_items
+plank_items_plank_dock_item_new
+plank_items_plank_dock_item_construct
+plank_services_log_level_get_type
+plank_services_logger_get_type
+plank_services_logger_initialize
+plank_services_logger_notification
+plank_services_logger_new
+plank_services_logger_construct
+plank_services_logger_get_DisplayLevel
+plank_services_logger_set_DisplayLevel
+plank_services_paths_get_type
+plank_services_paths_initialize
+plank_services_paths_ensure_directory_exists
+plank_services_paths_new
+plank_services_paths_construct
+plank_services_paths_get_HomeFolder
+plank_services_paths_set_HomeFolder
+plank_services_paths_get_DataFolder
+plank_services_paths_set_DataFolder
+plank_services_paths_get_ConfigHomeFolder
+plank_services_paths_set_ConfigHomeFolder
+plank_services_paths_get_DataHomeFolder
+plank_services_paths_set_DataHomeFolder
+plank_services_paths_get_CacheHomeFolder
+plank_services_paths_set_CacheHomeFolder
+plank_services_paths_get_DataDirFolders
+plank_services_paths_set_DataDirFolders
+plank_services_paths_get_AppConfigFolder
+plank_services_paths_set_AppConfigFolder
+plank_services_paths_get_AppDataFolder
+plank_services_paths_set_AppDataFolder
+plank_services_paths_get_AppCacheFolder
+plank_services_paths_set_AppCacheFolder
+plank_services_prefs_serializable_prefs_serialize
+plank_services_prefs_serializable_prefs_deserialize
+plank_services_preferences_construct
+plank_services_preferences_verify
+plank_services_preferences_reset_properties
+plank_services_preferences_construct_with_file
+plank_services_preferences_init_from_file
+plank_services_preferences_delay
+plank_services_preferences_apply
+plank_services_preferences_delete
+plank_services_system_get_type
+plank_services_system_open_uri
+plank_services_system_open
+plank_services_system_open_files
+plank_services_system_launch
+plank_services_system_launch_with_files
+plank_services_system_new
+plank_services_system_construct
+plank_widgets_composited_window_new
+plank_widgets_composited_window_construct
+plank_widgets_composited_window_new_with_type
+plank_widgets_composited_window_construct_with_type
+plank_widgets_dock_window_new
+plank_widgets_dock_window_construct
+plank_widgets_dock_window_set_hovered
+plank_widgets_dock_window_update_hovered
+plank_widgets_dock_window_position_hover
+plank_widgets_dock_window_set_size
+plank_widgets_dock_window_reposition
+plank_widgets_dock_window_update_icon_regions
+plank_widgets_dock_window_menu_is_visible
+plank_widgets_dock_window_do_popup
+plank_widgets_dock_window_on_menu_hide
+plank_widgets_dock_window_position_menu
+plank_widgets_dock_window_get_HoveredItem
+plank_widgets_dock_window_set_HoveredItem
+plank_widgets_hover_window_new
+plank_widgets_hover_window_construct
+plank_widgets_hover_window_move_hover
+plank_widgets_hover_window_get_Text
+plank_widgets_hover_window_set_Text
+plank_widgets_poof_window_get_type
+plank_widgets_poof_window_new
+plank_widgets_poof_window_construct
+plank_widgets_titled_separator_menu_item_get_type
+plank_widgets_titled_separator_menu_item_new
+plank_widgets_titled_separator_menu_item_construct
+plank_widgets_titled_separator_menu_item_new_no_line
+plank_widgets_titled_separator_menu_item_construct_no_line

=== added file 'lib/plank3.deps'
--- lib/plank3.deps	1970-01-01 00:00:00 +0000
+++ lib/plank3.deps	2012-02-28 16:22:32 +0000
@@ -0,0 +1,8 @@
+cairo
+gdk-pixbuf-2.0
+gdk-3.0 
+gee-1.0
+gio-2.0
+glib-2.0
+gobject-2.0
+gtk+-3.0

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2011-04-11 06:18:34 +0000
+++ po/POTFILES.skip	2012-02-28 16:22:32 +0000
@@ -1,6 +1,6 @@
-lib/*.c
+lib/Items/ApplicationDockItem.2.c
 lib/Items/ApplicationDockItem.c
+lib/Items/FileDockItem.2.c
 lib/Items/FileDockItem.c
+lib/Items/PlankDockItem.2.c
 lib/Items/PlankDockItem.c
-lib/Items/TransientDockItem.c
-

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-01-16 13:00:04 +0000
+++ src/Makefile.am	2012-02-28 16:22:32 +0000
@@ -2,9 +2,18 @@
 
 VAPIDIR = $(top_srcdir)/vapi
 
-plank_VALAFLAGS = \
-	$(PLANK_CORE_VALAFLAGS) \
-	$(top_srcdir)/lib/plank.vapi \
+if USE_GTK2
+SUFFIX=
+plank_VALAFLAGS = \
+	$(PLANK_CORE_2_VALAFLAGS)
+else
+SUFFIX=3
+plank_VALAFLAGS = \
+	$(PLANK_CORE_VALAFLAGS)
+endif
+
+plank_VALAFLAGS += \
+	$(top_srcdir)/lib/plank$(SUFFIX).vapi \
 	--vapidir $(VAPIDIR) \
 	$(VAPIDIR)/config.vapi \
 	$(NULL)
@@ -23,7 +32,7 @@
 	
 plank_LDADD = \
 	$(PLANK_CORE_LIBS) \
-	$(top_builddir)/lib/libplank.la \
+	$(top_builddir)/lib/libplank$(SUFFIX).la \
 	$(NULL)
 
 plank_VALASOURCES = \