gnome-settings-daemon r273 - in trunk: . plugins/media-keys/actions

[jensg svn gnome org]

Author: jensg
Date: Mon Apr  7 19:42:48 2008
New Revision: 273
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=273&view=rev

Log:
2008-04-07  Jens Granseuer  <jensgr gmx net>

	Remove the Thinkpad driver again. See bug #524425 for some discussion.

	* configure.ac:
	* plugins/media-keys/actions/Makefile.am:
	* plugins/media-keys/actions/acme-volume-thinkpad.c:
	* plugins/media-keys/actions/acme-volume-thinkpad.h:
	* plugins/media-keys/actions/acme-volume.c: (acme_volume_new): remove
	extra Thinkpad support


Removed:
   trunk/plugins/media-keys/actions/acme-volume-thinkpad.c
   trunk/plugins/media-keys/actions/acme-volume-thinkpad.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/media-keys/actions/Makefile.am
   trunk/plugins/media-keys/actions/acme-volume.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Apr  7 19:42:48 2008
@@ -315,25 +315,6 @@
 
 AM_CONDITIONAL(HAVE_ALSA, test x"$have_alsa" = "xyes")
 
-dnl ==============================================
-dnl IBM Thinkpad support
-dnl ==============================================
-
-AC_ARG_ENABLE(thinkpad,
-	      AC_HELP_STRING([--disable-thinkpad],
-			     [disable IBM Thinkpad hardware volume button support]),
-			     [case "${enableval}" in
-			     yes) WANT_THINKPAD=yes ;;
-			     no)  WANT_THINKPAD=no ;;
-			     *) AC_MSG_ERROR(bad value ${enableval} for --enable-thinkpad) ;;
-			     esac],
-			     [WANT_THINKPAD=yes]) dnl Default value
-
-if test "x$WANT_THINKPAD" = xyes; then
-  AC_DEFINE(ENABLE_IBM_THINKPAD, 1, [Define to enable Thinkpad hardware volume buttons support])
-fi
-AM_CONDITIONAL(ENABLE_IBM_THINKPAD, test "x$WANT_THINKPAD" = "xyes")
-
 # ---------------------------------------------------------------------------
 # Enable Profiling
 # ---------------------------------------------------------------------------

Modified: trunk/plugins/media-keys/actions/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/actions/Makefile.am	(original)
+++ trunk/plugins/media-keys/actions/Makefile.am	Mon Apr  7 19:42:48 2008
@@ -61,13 +61,6 @@
 endif # HAVE_ALSA
 endif # HAVE_GSTREAMER
 
-if ENABLE_IBM_THINKPAD
-libacme_la_SOURCES += \
-	acme-volume-thinkpad.c \
-	acme-volume-thinkpad.h \
-	$(NULL)
-endif
-
 gladedir = $(pkgdatadir)
 glade_DATA = 		\
 	acme.glade	\

Modified: trunk/plugins/media-keys/actions/acme-volume.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume.c	Mon Apr  7 19:42:48 2008
@@ -31,9 +31,6 @@
 #ifdef HAVE_GSTREAMER
 #include "acme-volume-gstreamer.h"
 #endif
-#ifdef ENABLE_IBM_THINKPAD
-#include "acme-volume-thinkpad.h"
-#endif
 
 static GObjectClass *parent_class = NULL;
 
@@ -102,17 +99,6 @@
 {
 	AcmeVolume *vol;
 
-#ifdef ENABLE_IBM_THINKPAD
-	/* Check if we should be doing ThinkPad speaker volume handling
-	   rather than the software stuff.  Checking for the existence
-	   of /proc/acpi/ibm/volume put in place by the ibm-acpi
-	   kernel driver */
-	if (g_file_test (ACME_VOLUME_THINKPAD_ACPI_PATH, G_FILE_TEST_IS_REGULAR))
-	{
-		vol = ACME_VOLUME (g_object_new (acme_volume_thinkpad_get_type (), NULL));
-		return vol;
-	}
-#endif
 #ifdef HAVE_GSTREAMER
 	vol = ACME_VOLUME (g_object_new (acme_volume_gstreamer_get_type (), NULL));
 	return vol;