Index: configure.ac.in
===================================================================
--- configure.ac.in	(revision 25991)
+++ configure.ac.in	(working copy)
@@ -8,6 +8,7 @@
 m4_define([gtk_minimum_version], [2.6.0])
 m4_define([xfce_minimum_version], [4.4.0])
 m4_define([xcomposite_minimum_version], [0.2])
+m4_define([wnck_minimum_version], [2.12])
 m4_define([startup_notification_minimum_version], [0.5])
 m4_define([intltool_minimum_version], [0.31])
 
@@ -61,10 +62,11 @@
   ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS])
 
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
-XDT_CHECK_PACKAGE(LIBXFCE4MCS_CLIENT, libxfce4mcs-client-1.0, [xfce_minimum_version])
-XDT_CHECK_PACKAGE(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, [xfce_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [xfce_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4MCS_MANAGER], [libxfce4mcs-manager-1.0], [xfce_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version])
-XDT_CHECK_PACKAGE(LIBXFCEGUI4, libxfcegui4-1.0, [xfce_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version])
+XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version])
 XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [xfce_minimum_version])
 
 dnl
Index: mcs-plugin/workspaces_plugin.c
===================================================================
--- mcs-plugin/workspaces_plugin.c	(revision 25991)
+++ mcs-plugin/workspaces_plugin.c	(working copy)
@@ -35,6 +35,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 
 #include <libxfce4util/libxfce4util.h>
 #include <xfce-mcs-manager/manager-plugin.h>
Index: mcs-plugin/xfwm4_shortcuteditor.c
===================================================================
--- mcs-plugin/xfwm4_shortcuteditor.c	(revision 25991)
+++ mcs-plugin/xfwm4_shortcuteditor.c	(working copy)
@@ -26,6 +26,7 @@
 #include <errno.h>
 
 #include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
 #include <libxfcegui4/libxfcegui4.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 
Index: mcs-plugin/workspaces.c
===================================================================
--- mcs-plugin/workspaces.c	(revision 25991)
+++ mcs-plugin/workspaces.c	(working copy)
@@ -38,6 +38,7 @@
 
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
+#include <libwnck/libwnck.h>
 #include <libxfce4mcs/mcs-manager.h>
 #include <xfce-mcs-manager/manager-plugin.h>
 
@@ -50,7 +51,7 @@
 #define WS_SEP_S ";"
 
 static McsManager *mcs_manager;
-static NetkScreen *netk_screen = NULL;
+static WnckScreen *wnck_screen = NULL;
 static gulong ws_created_id = 0;
 static gulong ws_destroyed_id = 0;
 
@@ -103,11 +104,11 @@
         else
         {
             const char *name = NULL;
-            NetkWorkspace *ws = netk_screen_get_workspace (netk_screen, i);
+            WnckWorkspace *ws = wnck_screen_get_workspace (wnck_screen, i);
 
             if (ws)
             {
-                name = netk_workspace_get_name (ws);
+                name = wnck_workspace_get_name (ws);
             }
             if (name && strlen (name))
             {
@@ -138,8 +139,8 @@
 
     mcs_manager = mcs_plugin->manager;
 
-    netk_screen = netk_screen_get_default ();
-    netk_screen_force_update (netk_screen);
+    wnck_screen = wnck_screen_get_default ();
+    wnck_screen_force_update (wnck_screen);
 
     ws_create_channel (mcs_manager, CHANNEL1, RCFILE1);
 
@@ -152,7 +153,7 @@
     }
 
     /* ws count */
-    ws_count = netk_screen_get_workspace_count (netk_screen);
+    ws_count = wnck_screen_get_workspace_count (wnck_screen);
 
     setting = mcs_manager_setting_lookup (mcs_manager, "Xfwm/WorkspaceCount", CHANNEL1);
 
@@ -533,9 +534,9 @@
 
 /* watch for changes by other programs */
 static void
-update_channel (NetkScreen * screen, NetkWorkspace * ws, McsManager * manager)
+update_channel (WnckScreen * screen, WnckWorkspace * ws, McsManager * manager)
 {
-    ws_count = netk_screen_get_workspace_count (screen);
+    ws_count = wnck_screen_get_workspace_count (screen);
 
     set_workspace_count (manager, ws_count, TRUE);
 }
@@ -543,10 +544,10 @@
 static void
 watch_workspaces_hint (McsManager * manager)
 {
-    ws_created_id = g_signal_connect (netk_screen, "workspace-created",
+    ws_created_id = g_signal_connect (wnck_screen, "workspace-created",
         G_CALLBACK (update_channel), manager);
 
-    ws_destroyed_id = g_signal_connect (netk_screen, "workspace-destroyed",
+    ws_destroyed_id = g_signal_connect (wnck_screen, "workspace-destroyed",
         G_CALLBACK (update_channel), manager);
 }
 
@@ -555,8 +556,8 @@
 {
     DBG ("Disconecting workspace signal handlers");
 
-    g_signal_handler_disconnect (netk_screen, ws_created_id);
-    g_signal_handler_disconnect (netk_screen, ws_destroyed_id);
+    g_signal_handler_disconnect (wnck_screen, ws_created_id);
+    g_signal_handler_disconnect (wnck_screen, ws_destroyed_id);
 
-    g_object_unref (netk_screen);
+    g_object_unref (wnck_screen);
 }
Index: mcs-plugin/Makefile.am
===================================================================
--- mcs-plugin/Makefile.am	(revision 25991)
+++ mcs-plugin/Makefile.am	(working copy)
@@ -70,6 +70,8 @@
 	$(LIBXFCE4MCS_MANAGER_CFLAGS)					\
 	$(LIBXFCEGUI4_CFLAGS)						\
 	$(XFCE_MCS_MANAGER_CFLAGS)					\
+	$(LIBWNCK_CFLAGS)						\
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE					\
 	-I$(top_builddir)/common					\
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
@@ -78,6 +80,7 @@
 workspaces_plugin_la_LIBADD =						\
 	$(LIBXFCEGUI4_LIBS)						\
 	$(LIBXFCE4MCS_MANAGER_LIBS)					\
+	$(LIBWNCK_LIBS)							\
 	$(LIBS)
 
 if HAVE_CYGWIN