From 92b48c3d5d8a159513dc6968ccf39f3f090b4c05 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@xfce.org>
Date: Wed, 17 Dec 2014 21:43:44 +0100
Subject: [PATCH] Reuse the same WNCK autoconf/automake macro, makes window
 icons working again with gtk3

---
 configure.ac.in | 7 +------
 src/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index ff4ab12..5a0808f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -76,12 +76,11 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
                            [GTK+ 3 support], [no])
 AM_CONDITIONAL([USE_GTK3], [test "x$GTK3_FOUND" = "xyes"])
 if test "x$GTK3_FOUND" = "xyes"; then
-	XDT_CHECK_OPTIONAL_PACKAGE([WNCK3], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes])
+	XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes])
 else
 	XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-1.0], [2.0], [wnck], [building with libwnck for window icons/names], [yes])
 	XDT_CHECK_OPTIONAL_PACKAGE([GKSU], [libgksu2], [2.0], [gksu], [building with libgksu to run as root], [yes])
 fi
-AM_CONDITIONAL([HAVE_WNCK3], [test x"$WNCK3_FOUND" = x"yes"])
 AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"])
 AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"])
 dnl ***********************************
@@ -157,11 +156,7 @@ echo
 echo "Build Configuration:"
 echo
 echo "* Gksu:          ${GKSU_VERSION:-no}"
-if test "x$GTK3_FOUND" = "xyes" ; then
-echo "* Wnck:          ${WNCK3_VERSION:-no}"
-else
 echo "* Wnck:          ${WNCK_VERSION:-no}"
-fi
 echo "* Cairo:         ${CAIRO_VERSION}"
 if test "x$GTK3_FOUND" = "xyes" ; then
 echo "* GTK+:          ${GTK3_VERSION}"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5242c50..2465a93 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,8 +33,8 @@ xfce4_taskmanager_SOURCES =						\
 	$(NULL)
 
 if USE_GTK3
-xfce4_taskmanager_LDADD +=	$(GTK3_LIBS) $(WNCK3_LIBS)
-xfce4_taskmanager_CFLAGS +=	$(GTK3_CFLAGS) $(WNCK3_CFLAGS)
+xfce4_taskmanager_LDADD +=	$(GTK3_LIBS) $(WNCK_LIBS)
+xfce4_taskmanager_CFLAGS +=	$(GTK3_CFLAGS) $(WNCK_CFLAGS)
 else
 xfce4_taskmanager_LDADD +=	$(GTK_LIBS) $(WNCK_LIBS)
 xfce4_taskmanager_CFLAGS +=	$(GTK_CFLAGS) $(WNCK_CFLAGS)