Add fix for api break between 2.18 and 2.20

(Old svn revision: 26152)

configure.in.in

@@ -115,6 +115,13 @@ XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.11])
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
 
+dnl ***************************
+dnl *** Check for wnck 2.20 ***
+dnl ***************************
+AC_CHECK_LIB(wnck-1, wnck_screen_get_number,
+    [AC_DEFINE([HAVE_WNCK_TWO_POINT_TWENTY], [1],
+        [Define if wnck_screen_get_number is present])])
+
 dnl ***********************************
 dnl *** Check for optional packages ***
 dnl ***********************************

plugins/iconbox/iconbox.c

@@ -451,7 +451,11 @@ icon_new (WnckWindow *window, Iconbox *ib)
 
 /* iconlist */
 static void
-iconbox_active_window_changed (WnckScreen *screen, WnckScreen *previous, gpointer data)
+iconbox_active_window_changed (WnckScreen *screen,
+#ifdef HAVE_WNCK_TWO_POINT_TWENTY
+                               WnckScreen *previous,
+#endif
+                               gpointer data)
 {
     Iconbox *ib = (Iconbox *)data;
     GSList *l;
@@ -467,7 +471,11 @@ iconbox_active_window_changed (WnckScreen *screen, WnckScreen *previous, gpointe
 }
 
 static void
-iconbox_active_workspace_changed (WnckScreen *screen, WnckWorkspace *previous_workspace, gpointer data)
+iconbox_active_workspace_changed (WnckScreen *screen,
+#ifdef HAVE_WNCK_TWO_POINT_TWENTY
+                                  WnckWorkspace *previous_workspace,
+#endif
+                                  gpointer data)
 {
     Iconbox *ib = (Iconbox *)data;
     GSList *l;

plugins/windowlist/windowlist.c

@@ -871,7 +871,9 @@ windowlist_state_changed (GtkWidget *button,
  **/
 static void
 windowlist_active_window_changed (WnckScreen *screen,
+#ifdef HAVE_WNCK_TWO_POINT_TWENTY
                                   WnckWindow *previous_window,
+#endif
                                   Windowlist *wl)
 {
     WnckWindow *window;