Author: nick
Date: 2007-10-20 11:23:40 +0000 (Sat, 20 Oct 2007)
New Revision: 26152
Modified:
xfce4-panel/trunk/configure.in.in
xfce4-panel/trunk/plugins/iconbox/iconbox.c
xfce4-panel/trunk/plugins/windowlist/windowlist.c
Log:
Add fix for api break between 2.18 and 2.20
Modified: xfce4-panel/trunk/configure.in.in
===================================================================
--- xfce4-panel/trunk/configure.in.in 2007-10-20 10:33:12 UTC (rev 26151)
+++ xfce4-panel/trunk/configure.in.in 2007-10-20 11:23:40 UTC (rev 26152)
@@ -115,6 +115,13 @@
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 ***********************************
Modified: xfce4-panel/trunk/plugins/iconbox/iconbox.c
===================================================================
--- xfce4-panel/trunk/plugins/iconbox/iconbox.c 2007-10-20 10:33:12 UTC (rev
26151)
+++ xfce4-panel/trunk/plugins/iconbox/iconbox.c 2007-10-20 11:23:40 UTC (rev
26152)
@@ -451,7 +451,11 @@
/* 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 @@
}
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;
Modified: xfce4-panel/trunk/plugins/windowlist/windowlist.c
===================================================================
--- xfce4-panel/trunk/plugins/windowlist/windowlist.c 2007-10-20 10:33:12 UTC
(rev 26151)
+++ xfce4-panel/trunk/plugins/windowlist/windowlist.c 2007-10-20 11:23:40 UTC
(rev 26152)
@@ -871,7 +871,9 @@
**/
static void
windowlist_active_window_changed (WnckScreen *screen,
+#ifdef HAVE_WNCK_TWO_POINT_TWENTY
WnckWindow *previous_window,
+#endif
Windowlist *wl)
{
WnckWindow *window;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
