From 69d49f5eb3fea9018a844dd3b49d5912c2305fce Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 16 Nov 2013 17:18:45 +0100
Subject: [PATCH] vapi: Update mutter bindings to 3.11.2

---
 CMakeLists.txt      |  8 ++++++++
 vapi/libmutter.vapi | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a88b0604..27b2ef70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,13 @@ if (MUTTER310_FOUND)
 	set (MUTTER310_FLAGS "--define=HAS_MUTTER310")
 endif (MUTTER310_FOUND)
 
+set (MUTTER312_FLAGS "")
+pkg_check_modules(MUTTER312 QUIET libmutter>=3.11)
+if (MUTTER312_FOUND)
+	pkg_check_modules(MUTTER310 REQUIRED libmutter>=3.11.2)
+	set (MUTTER312_FLAGS "--define=HAS_MUTTER312")
+endif (MUTTER312_FOUND)
+
 add_definitions(${DEPS_CFLAGS})
 
 link_libraries(${DEPS_LIBRARIES})
@@ -99,6 +106,7 @@ OPTIONS
     ${MUTTER36_FLAGS}
     ${MUTTER38_FLAGS}
     ${MUTTER310_FLAGS}
+    ${MUTTER312_FLAGS}
     )
 
 #add_subdirectory (po)
diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi
index d3db8b42..c083bf09 100644
--- a/vapi/libmutter.vapi
+++ b/vapi/libmutter.vapi
@@ -489,8 +489,10 @@ namespace Meta {
 #endif
 		[CCode (cheader_filename = "meta/keybindings.h", cname = "meta_keybindings_set_custom_handler")]
 		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc? handler);
+#if !HAS_MUTTER312
 		[CCode (cheader_filename = "meta/keybindings.h", cname = "meta_keybindings_switch_window")]
 		public static void switch_window (Meta.Display display, Meta.Screen screen, Meta.Window event_window, X.Event event, Meta.KeyBinding binding);
+#endif
 	}
 	[CCode (cheader_filename = "meta/main.h")]
 	[Compact]
@@ -646,7 +648,11 @@ namespace Meta {
 		public void set_opaque_region (owned Cairo.Region opaque_region);
 #endif
 		public void set_pixmap (X.Pixmap pixmap);
+#if HAS_MUTTER312
+		public void update_area (int x, int y, int width, int height, Cairo.Region unobscured_region);
+#else
 		public void update_area (int x, int y, int width, int height);
+#endif
 	}
 	[CCode (cheader_filename = "meta/theme.h")]
 	[Compact]
@@ -677,7 +683,11 @@ namespace Meta {
 		public bool can_close ();
 #endif
 		public void change_workspace (Meta.Workspace workspace);
+#if HAS_MUTTER312
+		public void change_workspace_by_index (int space_index, bool append);
+#else
 		public void change_workspace_by_index (int space_index, bool append, uint32 timestamp);
+#endif
 #if HAS_MUTTER38
 		public void check_alive (uint32 timestamp);
 #endif