[dasher] libwnck really isn't used.

[Patrick Welche <pwelche src gnome org>]

commit 93729ac4c4d3233805456ad6126bc556a9b7b733
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Tue Aug 18 23:23:21 2009 +0200

    libwnck really isn't used.

 ChangeLog                  |    4 ++++
 Src/Common/Makefile.am     |    2 +-
 Src/DasherCore/Makefile.am |   16 ++++++++--------
 configure.ac               |   13 ++-----------
 4 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 872f112..6e4d401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-18  Patrick Welche <prlw1 cam ac uk>
+
+	* libwnck really isn't used.
+
 2009-08-16  Patrick Welche <prlw1 cam ac uk>
 
 	* Complete GtkBuilder move for direct mode.
diff --git a/Src/Common/Makefile.am b/Src/Common/Makefile.am
index 8333a96..cc51aad 100644
--- a/Src/Common/Makefile.am
+++ b/Src/Common/Makefile.am
@@ -24,6 +24,6 @@ libdashermisc_a_SOURCES = \
 #		IOstreamDasherEdit.cc   I have no idea what this does, but it's broken now
 #		IOstreamDasherEdit.h 
 
-AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(gnome_CFLAGS) $(wnck_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
+AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(gnome_CFLAGS)
 
 EXTRA_DIST = Common.vcproj Common_vc70.vcproj Common_vc71.vcproj Common_vc80.vcproj
diff --git a/Src/DasherCore/Makefile.am b/Src/DasherCore/Makefile.am
index f447bb0..47ad84d 100644
--- a/Src/DasherCore/Makefile.am
+++ b/Src/DasherCore/Makefile.am
@@ -9,19 +9,19 @@ libdasherprefs_a_SOURCES = \
 
 libdashercore_a_SOURCES = \
 		Alphabet/AlphIO.cpp \
-                Alphabet/AlphIO.h \
-                Alphabet/Alphabet.cpp \
-                Alphabet/Alphabet.h \
-                Alphabet/AlphabetMap.cpp \
-                Alphabet/AlphabetMap.h \
-                Alphabet/GroupInfo.h \
+		Alphabet/AlphIO.h \
+		Alphabet/Alphabet.cpp \
+		Alphabet/Alphabet.h \
+		Alphabet/AlphabetMap.cpp \
+		Alphabet/AlphabetMap.h \
+		Alphabet/GroupInfo.h \
 		AlternatingDirectMode.cpp \
 		AlternatingDirectMode.h \
 		ActionButton.cpp \
 		ActionButton.h \
 		AlphabetManager.cpp \
 		AlphabetManager.h \
-                AlphabetManagerFactory.cpp \
+		AlphabetManagerFactory.cpp \
 		AlphabetManagerFactory.h \
 		AutoSpeedControl.cpp \
 		AutoSpeedControl.h \
@@ -157,7 +157,7 @@ EXTRA_libdashercore_a_SOURCES = \
 		PinyinParser.cpp \
 		PinyinParser.h
 
-AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(gnome_CFLAGS) $(wnck_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
+AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(gnome_CFLAGS)
 
 EXTRA_DIST = \
 		LanguageModelling/BigramLanguageModel.cpp \
diff --git a/configure.ac b/configure.ac
index b0610b3..7af7cc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,12 +327,6 @@ fi
 
 if test x"$BUILDGTK2" = xtrue; then 
 	PKG_CHECK_MODULES(gthread, gthread-2.0)
-
-
-dnl	if test x"$WITHMAEMO" = xfalse; then
-dnl		PKG_CHECK_MODULES(wnck, libwnck-1.0)
-dnl	        AC_DEFINE([HAVE_WNCK], 1, [wnck is present])
-dnl	fi
 fi
 
 if test x"$GCONF2HERE" = xtrue ; then
@@ -354,9 +348,6 @@ AC_SUBST(gnome_CFLAGS)
 AC_SUBST(gthread_LIBS)
 AC_SUBST(gthread_CFLAGS)
 
-AC_SUBST(wnck_LIBS)
-AC_SUBST(wnck_CFLAGS)
-
 AC_SUBST(hildon_LIBS)
 AC_SUBST(hildon_CFLAGS)
 
@@ -390,9 +381,9 @@ fi
 AC_SUBST(SETTINGS_CFLAGS)
 AC_SUBST(SETTINGS_LIBS)
 
-GTK2BUILD_CFLAGS="$GTK2_CFLAGS $GIO_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
+GTK2BUILD_CFLAGS="$GTK2_CFLAGS $GIO_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $gnome_CFLAGS $hildon_CFLAGS"
 
-GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $GIO_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $GIO_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $gnome_LIBS $hildon_LIBS"
 
 AC_SUBST(GTK2BUILD_CFLAGS)
 AC_SUBST(GTK2BUILD_LIBS)