[gnome-panel/gtk3] wncklet: Update after API change and single-include change in libwnck

[Vincent Untz <vuntz src gnome org>]

commit c0ca282d06f0ed8a59f5ef5ff4e62b18291c9a05
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Jan 31 00:09:21 2011 +0100

    wncklet: Update after API change and single-include change in libwnck

 applets/wncklet/Makefile.am          |    1 +
 applets/wncklet/showdesktop.c        |    4 +---
 applets/wncklet/window-list.c        |    4 +---
 applets/wncklet/window-menu.c        |    4 +---
 applets/wncklet/wncklet.c            |    3 +--
 applets/wncklet/wncklet.h            |    3 +--
 applets/wncklet/workspace-switcher.c |    4 +---
 7 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index f89cd98..2bacc15 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS =							\
 	-DPAGER_BUILDERDIR=\""$(uidir)"\"			\
 	-DTASKLIST_BUILDERDIR=\""$(uidir)"\"			\
 	-DWNCK_MENU_UI_DIR=\""$(xmluidir)"\"			\
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE				\
 	$(DISABLE_DEPRECATED_CFLAGS)
 
 AM_CFLAGS = $(WARN_CFLAGS)
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index 3a6d813..06f9521 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -21,8 +21,6 @@
  * 02111-1307, USA.
  */
 
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -32,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
-#include <libwnck/screen.h>
+#include <libwnck/libwnck.h>
 
 #include "wncklet.h"
 #include "showdesktop.h"
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 330abe8..77e0b07 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -8,8 +8,6 @@
  *
  */
 
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -507,7 +505,7 @@ window_list_applet_fill (PanelApplet *applet)
 		break;
 	}
 
-	tasklist->tasklist = wnck_tasklist_new (NULL);
+	tasklist->tasklist = wnck_tasklist_new ();
 
         wnck_tasklist_set_icon_loader (WNCK_TASKLIST (tasklist->tasklist),
                                        icon_loader_func,
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 5e86e3f..294a931 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -25,8 +25,6 @@
  *      Jacob Berkman <jacob helixcode com>
  */
 
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -37,7 +35,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libwnck/selector.h>
+#include <libwnck/libwnck.h>
 
 #include "wncklet.h"
 #include "window-menu.h"
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index cfa5f6a..6eb0f72 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -30,8 +30,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/screen.h>
-#include <libwnck/util.h>
+#include <libwnck/libwnck.h>
 
 #include "wncklet.h"
 #include "window-menu.h"
diff --git a/applets/wncklet/wncklet.h b/applets/wncklet/wncklet.h
index 77c2366..32817d8 100644
--- a/applets/wncklet/wncklet.h
+++ b/applets/wncklet/wncklet.h
@@ -24,8 +24,7 @@
 #ifndef __WNCKLET_H__
 #define __WNCKLET_H__
 
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-#include <libwnck/screen.h>
+#include <libwnck/libwnck.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index 543d1c1..c3787c3 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -8,8 +8,6 @@
  *
  */
 
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -519,7 +517,7 @@ workspace_switcher_applet_fill (PanelApplet *applet)
 		break;
 	}
 
-	pager->pager = wnck_pager_new (NULL);
+	pager->pager = wnck_pager_new ();
 	pager->screen = NULL;
 	pager->wm = PAGER_WM_UNKNOWN;
 	wnck_pager_set_shadow_type (WNCK_PAGER (pager->pager), GTK_SHADOW_IN);