[gnome-applets] No more gswitchit applet

[Sergey V. Udaltsov <svu src gnome org>]

commit d197e1041f6e52e7734e7094ef9c6bd12a1ae9ac
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Sun Dec 27 17:45:53 2009 +0000

    No more gswitchit applet
    
    Since g-s-d now has notification icon, there applet is not needed any
    more. The help files should be moved perhaps as well. And xmodmap files
    as well.

 Makefile.am                                 |    5 -
 configure.in                                |   38 +--
 gswitchit/ChangeLog.old                     |  629 -----------------------
 gswitchit/GNOME_GSwitchItApplet.xml         |   16 -
 gswitchit/GNOME_KeyboardApplet.server.in.in |   45 --
 gswitchit/Makefile.am                       |   60 ---
 gswitchit/gswitchit-applet.c                |  712 ---------------------------
 gswitchit/gswitchit-applet.h                |   34 --
 gswitchit/gswitchit-applet.png              |  Bin 2378 -> 0 bytes
 gswitchit/gswitchit-properties-capplet.png  |  Bin 2378 -> 0 bytes
 gswitchit/gswitchit.ui                      |   83 ---
 gswitchit/switch.c                          |   37 --
 po/POTFILES.in                              |    4 -
 13 files changed, 1 insertions(+), 1662 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4cb2bc3..f32ffc2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,10 +24,6 @@ if APPLET_ACCESSX
 accessx_status_SUBDIR = accessx-status
 endif
 
-if BUILD_KEYBOARD_APPLET
-keyboard_applet_SUBDIRS = gswitchit
-endif
-
 if BUILD_CPUFREQ_APPLET
 cpufreq_SUBDIR = cpufreq
 endif
@@ -59,7 +55,6 @@ SUBDIRS = \
 	$(vfs_SUBDIRS)		\
 	$(battstat_SUBDIR)	\
 	$(accessx_status_SUBDIR)\
-	$(keyboard_applet_SUBDIRS)	\
 	$(invest_applet_SUBDIR)	\
 	$(cpufreq_SUBDIR) \
 	$(mixer_applet_SUBDIR)
diff --git a/configure.in b/configure.in
index 0ee18a6..df9007d 100644
--- a/configure.in
+++ b/configure.in
@@ -135,24 +135,6 @@ AC_SUBST(GTOP_APPLETS_CFLAGS)
 AC_SUBST(GTOP_APPLETS_LIBS)
 AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
 
-dnl -- check for libgnomekbd (optional) ---------------------------------------
-PKG_CHECK_MODULES(LIBGNOMEKBDUI, libgnomekbdui >= 2.21.4.1,
-	HAVE_LIBGNOMEKBD=yes, HAVE_LIBGNOMEKBD=no)
-
-AC_SUBST(LIBGNOMEKBDUI_CFLAGS)
-AC_SUBST(LIBGNOMEKBDUI_LIBS)
-
-if test "x$HAVE_LIBGNOMEKBD" = "xno"; then
-   BUILD_KEYBOARD_APPLET=no
-   AC_MSG_WARN(
-       [libgnomekbd was not found and is required to build gnome-keyboard-applet.],
-	1)
-else
-   BUILD_KEYBOARD_APPLET=yes
-fi
-
-AM_CONDITIONAL(BUILD_KEYBOARD_APPLET, test "x$BUILD_KEYBOARD_APPLET" = "xyes")
-
 dnl -- check for gnome-settings-daemon (optional) -----------------------------
 PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gnome-settings-daemon,
 	HAVE_GNOME_SETTINGS_DAEMON=yes, HAVE_GNOME_SETTINGS_DAEMON=no)
@@ -189,16 +171,9 @@ PKG_CHECK_MODULES(CPUFREQ_SELECTOR, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $G
 AC_SUBST(CPUFREQ_SELECTOR_CFLAGS)
 AC_SUBST(CPUFREQ_SELECTOR_LIBS)
 
-dnl -- check for dbus (required for gnome-keyboard-applet and cpufreq-selector)
+dnl -- check for dbus (required for cpufreq-selector)
 PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_DBUS=yes, HAVE_DBUS=no)
 
-if test "x$BUILD_KEYBOARD_APPLET" = "xyes"; then
-  if test "x$HAVE_DBUS" = "xno"; then
-    AC_MSG_ERROR(
-        [dbus was not found and is required to build gnome-keyboard-applet.])
-  fi
-fi
-
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
@@ -399,16 +374,6 @@ dnl *** gnome-doc-utils                                                     ***
 dnl ***************************************************************************
 GNOME_DOC_INIT
 
-dnl ***************************************************************************
-dnl *** gnome-keyboard-applet specific checks                               ***
-dnl ***************************************************************************
-
-dnl -- check to enable flags with --enable-flags ------------------------------
-AC_ARG_ENABLE(flags,
-[  --enable-flags          Enable flags usage in the keyboard indicators],
-, enable_flags=no)
-AM_CONDITIONAL(ENABLE_FLAGS, test x$enable_flags != xno)
-
 case "$host" in
 	sparc-*-solaris*)	gkb_type_sun=true;;
 	*)			gkb_type_sun=false;;
@@ -783,7 +748,6 @@ gnome-applets-$VERSION configure summary:
 	 - geyes			always
 	 - gweather			$build_libgweather_applets
 	 - invest-applet		$BUILD_INVEST_APPLET
-	 - keyboard-applet		$BUILD_KEYBOARD_APPLET
 	 - mini-commander		$enable_mini_commander
 	 - modemlights			$BUILD_MODEM_LIGHTS
 	 - mixer			$enable_mixer
diff --git a/gswitchit/Makefile.am b/gswitchit/Makefile.am
index 5b60ce3..15831f8 100644
--- a/gswitchit/Makefile.am
+++ b/gswitchit/Makefile.am
@@ -1,61 +1 @@
 SUBDIRS = help
-
-EXTRA_DIST = \
-	$(server_in_in_files) \
-        $(ui_DATA) \
-        $(builder_DATA)
-
-libexec_PROGRAMS = gnome-keyboard-applet
-noinst_LIBRARIES = libgswitchit-applet.a
-
-gnome_keyboard_applet_SOURCES = switch.c
-
-libgswitchit_applet_a_SOURCES = gswitchit-applet.c \
-                         gswitchit-applet.h
-
-if ENABLE_FLAGS
-  flags_CFLAGS = -DENABLE_FLAGS=1
-endif
-
-COMMON_CFLAGS =				\
-	-I$(top_srcdir)			\
-	-I.				\
-	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
-	$(LIBGNOMEKBDUI_CFLAGS)		\
-	$(GNOME_APPLETS_CFLAGS)		\
-	$(GNOME_LIBS2_CFLAGS)		\
-	$(flags_CFLAGS)	
-
-COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
-	      $(GNOME_APPLETS_LIBS) \
-	      $(GNOME_LIBS2_LIBS)
-
-libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
-
-gnome_keyboard_applet_CFLAGS = $(COMMON_CFLAGS)
-
-gnome_keyboard_applet_LDFLAGS = -export-dynamic
-
-gnome_keyboard_applet_LDADD = \
-                         libgswitchit-applet.a \
-                         $(COMMON_LIBS)
-
-serverdir       = $(libdir)/bonobo/servers
-server_in_files = GNOME_KeyboardApplet.server.in
-server_in_in_files = $(server_in_files:.server.in=.server.in.in) 
-server_DATA     = $(server_in_files:.server.in=.server)
-
-$(server_in_files): $(server_in_in_files) 
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ VERSION\@|$(VERSION)|" $< > $@
-
-CLEANFILES = $(server_in_files) $(server_DATA)
-
- INTLTOOL_SERVER_RULE@
-
-uidir = $(datadir)/gnome-2.0/ui
-ui_DATA = GNOME_GSwitchItApplet.xml
-
-builder_DATA = gswitchit.ui
-
-
--include $(top_srcdir)/git.mk
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6607cf9..c656db6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,10 +41,6 @@ geyes/geyes.schemas.in
 geyes/themes.c
 gkb-new/xmodmap/base.xml.in
 gkb-new/xmodmap.sun/base.xml.in
-gswitchit/GNOME_GSwitchItApplet.xml
-gswitchit/GNOME_KeyboardApplet.server.in.in
-gswitchit/gswitchit-applet.c
-[type: gettext/glade]gswitchit/gswitchit.ui
 gweather/GNOME_GWeatherApplet.xml
 gweather/GNOME_GWeatherApplet_Factory.server.in.in
 gweather/gweather-about.c