diff --git a/configure.ac b/configure.ac

index 5fada1a..b450ff0 100644

--- a/configure.ac

+++ b/configure.ac

@@ -271,6 +271,48 @@ AM_CONDITIONAL(HAVE_PULSE, test "x$have_

 AC_SUBST(PULSE_CFLAGS)

 AC_SUBST(PULSE_LIBS)

+dnl ==============================================

+dnl GStreamer section

+dnl ==============================================

+GST_MAJORMINOR=auto

+

+AC_ARG_ENABLE(gstreamer,

+AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]),

+[case "${enableval}" in

+ yes) ENABLE_GSTREAMER=yes ;;

+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;

+ no)  ENABLE_GSTREAMER=no ;;

+ *) AC_MSG_ERROR([

+                  *** Bad value ${enableval} for --enable-gstreamer

+                  *** Please use one of the following:

+                  ***    --enable-gstreamer=0.10

+               ]) ;;

+esac],

+[ENABLE_GSTREAMER=yes]) dnl Default value

+

+have_gstreamer=no

+if test "x$ENABLE_GSTREAMER" = "xyes"; then

+   GST_REQS=0.10.1.2

+   PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"

+

+   PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,

+                     AC_MSG_RESULT([no]))

+

+   if test "x$have_pulse" = "xtrue"; then

+      AC_MSG_ERROR([*** GStreamer & Pulseaudio both are selected ***])

+   fi

+

+   if test "x$have_gstreamer" = "xyes"; then

+      GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"

+      AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer])

+   fi

+else

+   AC_MSG_NOTICE([*** GStreamer support disabled ***])

+fi

+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")

+AC_SUBST(GST_LIBS)

+AC_SUBST(GST_CFLAGS)

+

 # ---------------------------------------------------------------------------

 # Enable Profiling

 # ---------------------------------------------------------------------------

@@ -409,6 +451,7 @@ echo "

         dbus-1 system.d dir:      ${DBUS_SYS_DIR}

         Libnotify support:        ${have_libnotify}

+        GStreamer support:        ${have_gstreamer}

         PulseAudio support:       ${have_pulse}

         Profiling support:        ${enable_profiling}

 "

diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am

index fae8a5e..edb215e 100644

--- a/plugins/media-keys/Makefile.am

+++ b/plugins/media-keys/Makefile.am

diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am

@@ -3,13 +3,8 @@ context = actions

 NULL =

-SUBDIRS =

-plugin_LTLIBRARIES =

-

-if HAVE_PULSE

-SUBDIRS += cut-n-paste

-plugin_LTLIBRARIES += libmedia-keys.la

-endif

+SUBDIRS = cut-n-paste

+plugin_LTLIBRARIES = libmedia-keys.la

 BUILT_SOURCES = 			\

 	gsd-media-keys-manager-glue.h	\

@@ -108,9 +103,7 @@ libmedia_keys_la_LIBADD  = 		\

 plugin_in_files = 		\

 	media-keys.gnome-settings-plugin.in

-if HAVE_PULSE

 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)

-endif

 noinst_PROGRAMS =				\

 	test-media-keys				\

@@ -176,9 +169,7 @@ test_media_keys_LDADD = \

 	$(GST_LIBS)				\

 	-lm

-if HAVE_PULSE

 test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la

-endif

 gtkbuilderdir = $(pkgdatadir)

 gtkbuilder_DATA =	\

index bc59a10..6486ac0 100644

--- a/plugins/media-keys/cut-n-paste/Makefile.am

+++ b/plugins/media-keys/cut-n-paste/Makefile.am

@@ -4,16 +4,24 @@ noinst_LTLIBRARIES = libgvc.la

 INCLUDES =					\

 	$(WARN_CFLAGS)				\

-	$(VOLUME_CONTROL_CFLAGS)		\

-	$(PULSE_CFLAGS)				\

 	$(NULL)

 libgvc_la_LIBADD =		\

-	$(VOLUME_CONTROL_LIBS)	\

-	$(PULSE_LIBS)		\

 	$(NULL)

 libgvc_la_SOURCES =			\

+	$(NULL)

+

+if HAVE_PULSE

+INCLUDES +=					\

+	$(VOLUME_CONTROL_CFLAGS)		\

+	$(PULSE_CFLAGS)

+

+libgvc_la_LIBADD +=		\

+	$(VOLUME_CONTROL_LIBS)	\

+	$(PULSE_LIBS)

+

+libgvc_la_SOURCES +=			\

 	gvc-mixer-stream.h		\

 	gvc-mixer-stream.c		\

 	gvc-channel-map.h		\

@@ -31,8 +39,22 @@ libgvc_la_SOURCES =			\

 	gvc-mixer-event-role.h		\

 	gvc-mixer-event-role.c		\

 	gvc-mixer-control.h		\

-	gvc-mixer-control.c		\

-	$(NULL)

+	gvc-mixer-control.c

+endif

+

+if HAVE_GSTREAMER

+INCLUDES +=					\

+	$(SETTINGS_PLUGIN_CFLAGS)		\

+	$(AM_CFLAGS)				\

+	$(GST_CFLAGS)

+

+libgvc_la_LIBADD +=		\

+	$(GST_LIBS)

+

+libgvc_la_SOURCES +=			\

+	gvc-gstreamer-acme-vol.c	\

+	gvc-gstreamer-acme-vol.h

+endif

 MAINTAINERCLEANFILES =                  \

         *~                              \

diff --git a/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c

new file mode 100644

index 0000000..8948480

--- /dev/null

+++ b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c

@@ -0,0 +1,472 @@

+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */

+

+/* acme-volume.c

+

+   Copyright (C) 2002, 2003 Bastien Nocera

+   Copyright (C) 2004 Novell, Inc.

+   Copyright (C) 2009 PERIER Romain <[email protected]>

+

+   The Gnome Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Library General Public License as

+   published by the Free Software Foundation; either version 2 of the

+   License, or (at your option) any later version.

+

+   The Gnome Library is distributed in the hope that it will be useful,

+   but WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+   Library General Public License for more details.

+

+   You should have received a copy of the GNU Library General Public

+   License along with the Gnome Library; see the file COPYING.LIB.  If not,

+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+   Boston, MA 02111-1307, USA.

+

+   Author: Bastien Nocera <[email protected]>

+           Jon Trowbridge <[email protected]>

+*/

+

+#include "config.h"

+#include "gvc-gstreamer-acme-vol.h"

+

+#include <glib.h>

+#include <glib/gi18n.h>

+

+#include <gst/gst.h>

+#include <gst/audio/mixerutils.h>

+#include <gst/interfaces/mixer.h>

+#include <gst/interfaces/propertyprobe.h>

+

+#include <gconf/gconf-client.h>

+

+#include <string.h>

+

+#define TIMEOUT	2

+

+#define DEFAULT_MIXER_DEVICE_KEY   "/desktop/gnome/sound/default_mixer_device"

+#define DEFAULT_MIXER_TRACKS_KEY   "/desktop/gnome/sound/default_mixer_tracks"

+#define GNOME_VOLUME_CONTROL_KEY_ACTIVE_ELEMENT "/apps/gnome-volume-control/active-element"

+

+

+#define ACME_VOLUME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACME_TYPE_VOLUME, AcmeVolumePrivate))

+

+struct AcmeVolumePrivate {

+	GstMixer     *mixer;

+	GList        *mixer_tracks;

+	guint         timer_id;

+	gdouble       volume;

+	gboolean      mute;

+	GConfClient  *gconf_client;

+	gchar        *gvc_mixer;

+	gboolean     found_mixer;

+};

+

+G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT)

+

+static gboolean acme_volume_open  (AcmeVolume *acme);

+static void     acme_volume_close (AcmeVolume *acme);

+static gboolean acme_volume_close_real (AcmeVolume *self);

+

+static gpointer acme_volume_object = NULL;

+

+static void

+acme_volume_finalize (GObject *object)

+{

+	AcmeVolume *self;

+

+	g_return_if_fail (object != NULL);

+	g_return_if_fail (ACME_IS_VOLUME (object));

+

+	self = ACME_VOLUME (object);

+

+	if (self->_priv->timer_id != 0)

+		g_source_remove (self->_priv->timer_id);

+	acme_volume_close_real (self);

+

+	if (self->_priv->gconf_client != NULL) {

+		g_object_unref (self->_priv->gconf_client);

+		self->_priv->gconf_client = NULL;

+	}

+

+	G_OBJECT_CLASS (acme_volume_parent_class)->finalize (object);

+}

+

+void

+acme_volume_set_mute (AcmeVolume *self, gboolean val)

+{

+	GList *t;

+

+	g_return_if_fail(ACME_IS_VOLUME(self));

+	g_return_if_fail(acme_volume_open(self));

+

+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {

+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);

+		gst_mixer_set_mute (self->_priv->mixer, track, val);

+	}

+	self->_priv->mute = val;

+	acme_volume_close (self);

+}

+

+static void

+update_state (AcmeVolume * self)

+{

+	gint *volumes, n;

+	gdouble vol = 0;

+	GstMixerTrack *track = GST_MIXER_TRACK (self->_priv->mixer_tracks->data);

+

+	/* update mixer by getting volume */

+	volumes = g_new0 (gint, track->num_channels);

+	gst_mixer_get_volume (self->_priv->mixer, track, volumes);

+	for (n = 0; n < track->num_channels; n++)

+		vol += volumes[n];

+	g_free (volumes);

+	vol /= track->num_channels;

+	vol = 100 * vol / (track->max_volume - track->min_volume);

+

+	/* update mute flag, and volume if not muted */

+	if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))

+		self->_priv->mute = TRUE;

+	self->_priv->volume = vol;

+}

+

+gboolean

+acme_volume_get_mute (AcmeVolume *self)

+{

+	g_return_val_if_fail(acme_volume_open(self), FALSE);

+

+	update_state (self);

+	acme_volume_close (self);

+

+	return self->_priv->mute;

+}

+

+gint

+acme_volume_get_volume (AcmeVolume *self)

+{

+

+	g_return_val_if_fail(acme_volume_open(self), 0);

+

+	update_state (self);

+

+	acme_volume_close (self);

+	

+	return (gint) (self->_priv->volume + 0.5);

+}

+

+void

+acme_volume_set_volume (AcmeVolume *self, gint val)

+{

+	GList *t;

+

+	g_return_if_fail(acme_volume_open(self));

+

+	val = CLAMP (val, 0, 100);

+

+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {

+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);

+		gint *volumes, n;

+		gdouble scale = (track->max_volume - track->min_volume) / 100.0;

+		gint vol = (gint) (val * scale + track->min_volume + 0.5);

+

+		volumes = g_new (gint, track->num_channels);

+		for (n = 0; n < track->num_channels; n++)

+			volumes[n] = vol;

+		gst_mixer_set_volume (self->_priv->mixer, track, volumes);

+		g_free (volumes);

+	}

+

+	/* update state */

+	self->_priv->volume = val;

+

+	acme_volume_close (self);

+}

+

+void

+acme_volume_mute_toggle (AcmeVolume *self)

+{

+	gboolean muted;

+

+	g_return_if_fail (self != NULL);

+	g_return_if_fail (ACME_IS_VOLUME(self));

+

+	muted = acme_volume_get_mute(self);

+	acme_volume_set_mute(self, !muted);

+}

+

+gint

+acme_volume_get_threshold (AcmeVolume *self)

+{

+	GList *t;

+	gint steps = 101;

+

+	g_return_val_if_fail(acme_volume_open(self), 1);

+

+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {

+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);

+		gint track_steps = track->max_volume - track->min_volume;

+		if (track_steps > 0 && track_steps < steps)

+			steps = track_steps;

+	}

+

+	acme_volume_close (self);

+

+	return 100 / steps + 1;

+}

+

+static gboolean

+acme_volume_close_real (AcmeVolume *self)

+{

+	if (self->_priv->mixer != NULL)

+	{

+		gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);

+		gst_object_unref (GST_OBJECT (self->_priv->mixer));

+		g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL);

+		g_list_free (self->_priv->mixer_tracks);

+		self->_priv->mixer = NULL;

+		self->_priv->mixer_tracks = NULL;

+	}

+

+	self->_priv->timer_id = 0;

+	return FALSE;

+}

+

+/*

+ * _acme_set_mixer

+ * @mixer  A pointer to mixer element

+ * @data   A pointer to user data (AcmeVolume instance to be modified)

+ * @return A gboolean indicating success if Master track was found, failed otherwises.

+ */

+static gboolean

+_acme_set_mixer(GstMixer *mixer, gpointer user_data)

+{

+	GstElementFactory *factory;

+	const GList *tracks;

+	const gchar *long_name;

+	gchar *devname = NULL;

+	gchar *name;

+	int p_count = 0;

+

+	for (tracks = gst_mixer_list_tracks (mixer); tracks != NULL; tracks = tracks->next) {

+		GstMixerTrack *track = GST_MIXER_TRACK (tracks->data);

+

+		if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {

+			AcmeVolume *self;

+

+			if (g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (mixer)),

+							  "device-name")) {

+				g_object_get (mixer, "device-name", &devname, NULL);

+			} else {

+				devname = NULL;

+			}

+

+			factory = gst_element_get_factory (GST_ELEMENT (mixer));

+			long_name = gst_element_factory_get_longname (factory);

+

+			if (devname) {

+				name = g_strdup_printf ("%s (%s)", devname, long_name);

+				g_free (devname);

+			} else {

+				gchar *title;

+

+				p_count += 1;

+

+				title = g_strdup_printf (_("Unknown Volume Control %d"),  p_count);

+				name = g_strdup_printf ("%s (%s)", title, long_name);

+				g_free (title);

+

+			}

+

+			self = ACME_VOLUME (user_data);

+

+			/*

+			 * Check to see if the mixer is the one defined as being used by

+			 * gnome-volume-control.  If so, use this one.  Otherwise return

+			 * the first one.

+			 */ 

+			if ((self->_priv->gvc_mixer != NULL &&

+			     strcmp (name, self->_priv->gvc_mixer) == 0) ||

+			    (self->_priv->found_mixer == FALSE)) {

+

+				self->_priv->found_mixer = TRUE;

+

+				if (self->_priv->mixer != NULL) {

+					/* If we set a previous mixer, free it */

+					gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);

+				}

+

+				self->_priv->mixer = mixer;

+

+				/* Free any previously set mixer tracks */

+				if (self->_priv->mixer_tracks != NULL) {

+					g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL);

+					g_list_free (self->_priv->mixer_tracks);

+					self->_priv->mixer_tracks = NULL;

+				}

+

+				self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));

+				return TRUE;

+			} else {

+				return FALSE;

+			}

+		}

+

+		continue;

+	}

+

+	return FALSE;

+}

+

+/* This is a modified version of code from gnome-media's gst-mixer */

+static gboolean

+acme_volume_open (AcmeVolume *self)

+{

+	gchar *mixer_device, **factory_and_device = NULL;

+	GList *mixer_list;

+

+	if (self->_priv->timer_id != 0) {

+		g_source_remove (self->_priv->timer_id);

+		self->_priv->timer_id = 0;

+		return TRUE;

+	}