--- gnome-applets-2.16.0.1/configure.in-orig	2006-09-14 17:37:27.788957000 -0500
+++ gnome-applets-2.16.0.1/configure.in	2006-09-14 18:03:16.615772000 -0500
@@ -152,6 +152,19 @@
 AC_SUBST(GTOP_APPLETS_LIBS)
 AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
 
++dnl --disable-gswitchit=(yes|no)
+AC_ARG_ENABLE(gswitchit,
+		[  --disable-gswitchit=[[no/yes]]
+			don't build gswitchit applet [[default: no]]],,
+		disable_gswitchit=no)
+
+dnl -- Set default value of HAVE_LIBXKLAVIER
+HAVE_LIBXKLAVIER=no
+
+dnl -- Don't both to check for libxklavier if gswitchit it disabled.  This will
+dnl -- cause BUILD_GSWITCHIT to be set to no.
+if test x$disable_gswitchit = xyes; then
+
 dnl -- check for libxklavier (optional) ---------------------------------------
 LIBXKLAVIER_CFLAGS=
 LIBXKLAVIER_LIBS=
@@ -170,6 +183,7 @@
 
 AC_SUBST(LIBXKLAVIER_CFLAGS)
 AC_SUBST(LIBXKLAVIER_LIBS)
+fi
 
 AM_CONDITIONAL(BUILD_KEYBOARD_APPLET, test "x$BUILD_KEYBOARD_APPLET" = "xyes")
 
--- gnome-applets-2.16.0.1/Makefile.am-orig	2006-09-14 17:46:34.070215000 -0500
+++ gnome-applets-2.16.0.1/Makefile.am	2006-09-14 17:44:03.113366000 -0500
@@ -34,7 +34,7 @@
 endif
 
 if BUILD_KEYBOARD_APPLET
-keyboard_applet_SUBDIRS = libgswitchit libkbdraw gswitchit
+keyboard_applet_SUBDIRS = libgswitchit libkbdraw gswitchit gkb-new
 endif
 
 if BUILD_CPUFREQ_APPLET
@@ -50,7 +49,6 @@ always_built_SUBDIRS = \
 	charpick	\
 	geyes		\
 	mini-commander	\
-	gkb-new		\
 	stickynotes	\
 	null_applet
 
diff -urN gnome-applets-2.14.1/null_applet/Makefile.am gnome-applets-2.14.1-hacked/null_applet/Makefile.am
--- gnome-applets-2.14.1/null_applet/Makefile.am	2005-01-07 13:15:26.000000000 +1300
+++ gnome-applets-2.14.1-hacked/null_applet/Makefile.am	2006-07-15 08:23:35.498817000 +1200
@@ -13,6 +13,7 @@
 server_in_files =				\
 	GNOME_NullApplet_Factory.server.in	\
 	GNOME_CDPlayerApplet.server.in		\
+	GNOME_KeyboardApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
 	GNOME_Panel_WirelessApplet.server.in
 server_DATA = $(server_in_files:.server.in=.server)
@@ -27,5 +28,6 @@
 EXTRA_DIST =					\
 	GNOME_NullApplet_Factory.server.in.in	\
 	GNOME_CDPlayerApplet.server.in		\
+	GNOME_KeyboardApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
 	GNOME_Panel_WirelessApplet.server.in
--- gnome-applets-2.15.3.old/null_applet/GNOME_KeyboardApplet.server.in	1970-01-01 01:00:00.000000000 +0100
+++ gnome-applets-2.15.3/null_applet/GNOME_KeyboardApplet.server.in	2006-08-11 15:42:55.487501000 +0100
@@ -0,0 +1,16 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_KeyboardApplet_Factory"
+            type="exe"
+            location="/usr/lib/null_applet">
+
+        <oaf_attribute name="repo_ids" type="stringv">
+                <item value="IDL:Bonobo/GenericFactory:1.0"/>
+                <item value="IDL:Bonobo/Unknown:1.0"/>
+        </oaf_attribute>
+        <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
+        <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
+
+</oaf_server>
+
+</oaf_info>