Merge branch 'michal-wip'

96 files changed, 580 insertions, 2274 deletions

diff --git a/Makefile.am b/Makefile.am
index 531c8f1..378e1c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +1,32 @@
 NULL =
 
-SUBDIRS = po man
+SUBDIRS = data po man mate-volume-control
 
-if HAVE_SOUND_THEME
-SUBDIRS += sound-theme
-endif
-
-# m-v-c depends on sound-theme, if enabled, so add here to SUBDIRS
-SUBDIRS += mate-volume-control
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-scrollkeeper	\
-	--enable-more-warnings  \
-	--enable-compile-warnings=maximum \
+DISTCHECK_CONFIGURE_FLAGS =			\
+	--enable-more-warnings			\
+	--enable-compile-warnings=maximum	\
 	--enable-deprecated
 
-DIST_SUBDIRS = \
-	po 			\
-	man			\
-	mate-volume-control	\
-	sound-theme		\
+DIST_SUBDIRS =					\
+	data					\
+	po 					\
+	man					\
+	mate-volume-control			\
 	$(NULL)
 
-EXTRA_DIST = \
-	.version		\
-	autogen.sh		\
-	configure		\
-	ChangeLog		\
-	COPYING			\
-	COPYING-DOCS		\
-	build-aux/git-version-gen \
-	$(INTLTOOL_BUILT:=.in)	\
+EXTRA_DIST =					\
+	.version				\
+	autogen.sh				\
+	configure				\
+	ChangeLog				\
+	COPYING					\
+	COPYING-DOCS				\
+	build-aux/git-version-gen 		\
+	$(INTLTOOL_BUILT:=.in)			\
 	$(NULL)
 
-DISTCLEANFILES = \
-	build-aux/mate-doc-utils.make	\
-	po/.intltool-merge-cache	\
+DISTCLEANFILES =				\
+	po/.intltool-merge-cache		\
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/NEWS b/NEWS
index 2c52bc2..dfc416d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
 =============
+Version 1.9.1
+=============
+
+- Removed PulseAudio dependency
+
+=============
 Version 1.9.0
 =============
 
diff --git a/autogen.sh b/autogen.sh
index 40692d6..7e9555a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,9 +21,4 @@ which mate-autogen || {
     exit 1
 }
 
-which yelp-build || {
-    echo "You need to install yelp-tools" 
-    exit 1
-}
-
 . mate-autogen "$@"
diff --git a/configure.ac b/configure.ac
index 655b9a0..6904a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,26 @@
 AC_PREREQ(2.60)
 
 AC_INIT([mate-media],
-        [1.9.0],
+        [1.9.1],
         [http://www.mate-desktop.org/])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz -Wall -Wno-portability tar-pax foreign check-news])
-
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-pax foreign check-news])
 AM_MAINTAINER_MODE
 
-if type -p stow > /dev/null && test -d /usr/local/stow ; then
-   AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE}-${VERSION} ***])
-   ac_default_prefix="/usr/local/stow/${PACKAGE}-${VERSION}"
-fi
-
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 IT_PROG_INTLTOOL([0.35.0])
 
-AC_PROG_CC
-AC_ISC_POSIX
-
 # Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AM_PROG_LIBTOOL
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -38,16 +32,11 @@ AC_C_INLINE
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MMAP
-
 GLIB_REQUIRED_VERSION=2.36.0
 GIO_REQUIRED_VERSION=2.36.0
-PA_REQUIRED_VERSION=0.9.16
 CANBERRA_REQUIRED_VERSION=0.13
-MATE_DESKTOP_REQUIRED_VERSION=1.9.1
-MATE_PANEL_REQUIRED_VERSION=1.7.0
+MATE_MIXER_REQUIRED_VERSION=1.9.1
+MATE_DESKTOP_REQUIRED_VERSION=1.9.3
 
 dnl=======================================================================
 dnl Support multiple GTK versions
@@ -77,27 +66,6 @@ case "$with_gtk" in
 esac
 
 dnl=======================================================================
-dnl Check for libcanberra
-dnl=======================================================================
-
-PKG_CHECK_MODULES(SOUND_THEME,
-        gobject-2.0 >= $GLIB_REQUIRED_VERSION
-        gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        libcanberra-gtk$CANBERRA_API_VERSION >= $CANBERRA_REQUIRED_VERSION
-        libxml-2.0,
-        have_soundtheme=yes,
-        have_soundtheme=no)
-
-if test "x$have_soundtheme" = "xyes" ; then
-  AC_DEFINE(HAVE_SOUND_THEME, [], [Define if we can build sound theme])
-fi
-AM_CONDITIONAL(HAVE_SOUND_THEME, test x$have_soundtheme = xyes)
-AC_SUBST(HAVE_SOUND_THEME)
-AC_SUBST(SOUNDTHEME_CFLAGS)
-AC_SUBST(SOUNDTHEME_LIBS)
-
-dnl=======================================================================
 dnl Check for the volume control modules
 dnl=======================================================================
 
@@ -109,50 +77,17 @@ PKG_CHECK_MODULES(VOLUME_CONTROL,
                   unique-$UNIQUE_API_VERSION
                   libxml-2.0
                   mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION
-                  libmatemixer
+                  libmatemixer >= $MATE_MIXER_REQUIRED_VERSION
 )
-
 AC_SUBST(VOLUME_CONTROL_CFLAGS)
 AC_SUBST(VOLUME_CONTROL_LIBS)
 
 dnl=======================================================================
-dnl Check for PulseAudio optional dependency
-dnl=======================================================================
-
-AC_ARG_ENABLE([pulseaudio],
-              AS_HELP_STRING([--enable-pulseaudio],
-                             [Enable PulseAudio support @<:@default=auto@:>@]),
-              enable_pulseaudio=$enableval, enable_pulseaudio=auto)
-
-if test "x$enable_pulseaudio" != "xno"; then
-  PKG_CHECK_MODULES(PULSEAUDIO,
-          libpulse >= $PA_REQUIRED_VERSION,
-          have_pulseaudio=yes,
-          have_pulseaudio=no)
-
-  if test "x$enable_pulseaudio" = "xyes" -a "x$have_pulseaudio" = "xno"; then
-    AC_MSG_ERROR([PulseAudio support explicitly requested but dependencies not found])
-  fi
-
-  if test "x$have_pulseaudio" = "xyes" ; then
-    AC_DEFINE(HAVE_PULSEAUDIO, [], [Define if we have pulseaudio])
-  fi
-else
-  have_pulseaudio=no
-fi
-AM_CONDITIONAL(HAVE_PULSEAUDIO, test x$have_pulseaudio = xyes)
-AC_SUBST(HAVE_PULSEAUDIO)
-AC_SUBST(PULSEAUDIO_CFLAGS)
-AC_SUBST(PULSEAUDIO_LIBS)
-
-dnl=======================================================================
 dnl GLib
 dnl=======================================================================
 
 GLIB_GSETTINGS
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
 dnl=======================================================================
 dnl i18n
 dnl=======================================================================
@@ -162,11 +97,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
 AM_GLIB_GNU_GETTEXT
 
-YELP_HELP_INIT
-
-AM_PROG_LIBTOOL
-AM_PROG_CC_C_O
-
 dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
@@ -183,8 +113,8 @@ AC_ARG_ENABLE(deprecated,
          [enable_deprecated=no])
 
 if test "x$enable_deprecated" = "xyes"; then
-   DISABLE_DEPRECATED=""
-     AC_SUBST(DISABLE_DEPRECATED)
+    DISABLE_DEPRECATED=""
+    AC_SUBST(DISABLE_DEPRECATED)
 fi
 
 # Turn on the additional warnings last, so warnings don't affect other tests.
@@ -198,6 +128,7 @@ AC_ARG_ENABLE(more-warnings,
                         set_more_warnings=no
                 fi
         ])
+
 AC_MSG_CHECKING(for more warnings)
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
         AC_MSG_RESULT(yes)
@@ -226,35 +157,28 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 else
         AC_MSG_RESULT(no)
 fi
-
-
 AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LIBS)
-AC_SUBST(LDFLAGS)
 
 AC_CONFIG_FILES([
 Makefile
+data/Makefile
+data/mate-volume-control.desktop.in
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/16x16/status/Makefile
+data/icons/22x22/Makefile
+data/icons/22x22/status/Makefile
+data/icons/24x24/Makefile
+data/icons/24x24/status/Makefile
+data/icons/32x32/Makefile
+data/icons/32x32/status/Makefile
+data/icons/scalable/Makefile
+data/icons/scalable/devices/Makefile
+data/icons/scalable/status/Makefile
+data/sounds/Makefile
 man/Makefile
 po/Makefile.in
-sound-theme/Makefile
-sound-theme/sounds/Makefile
 mate-volume-control/Makefile
-mate-volume-control/data/Makefile
-mate-volume-control/data/mate-volume-control.desktop.in
-mate-volume-control/data/icons/Makefile
-mate-volume-control/data/icons/16x16/Makefile
-mate-volume-control/data/icons/16x16/status/Makefile
-mate-volume-control/data/icons/22x22/Makefile
-mate-volume-control/data/icons/22x22/status/Makefile
-mate-volume-control/data/icons/24x24/Makefile
-mate-volume-control/data/icons/24x24/status/Makefile
-mate-volume-control/data/icons/32x32/Makefile
-mate-volume-control/data/icons/32x32/status/Makefile
-mate-volume-control/data/icons/scalable/Makefile
-mate-volume-control/data/icons/scalable/devices/Makefile
-mate-volume-control/data/icons/scalable/status/Makefile
-mate-volume-control/src/Makefile
 ])
 
 AC_OUTPUT
@@ -262,7 +186,7 @@ AC_OUTPUT
 echo "
 
                     ${PACKAGE} ${VERSION}
-                    ============
+                    ==========
 
 
         Prefix:                      ${prefix}
@@ -270,5 +194,4 @@ echo "
         Compiler:                    ${CC}
         CFLAGS:                      ${CFLAGS}
         GTK+ API version:            ${GTK_API_VERSION}
-        PulseAudio:                  ${have_pulseaudio}
 "
diff --git a/mate-volume-control/data/Makefile.am b/data/Makefile.am
index c580a45..47394ff 100644
--- a/mate-volume-control/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,8 @@
 NULL =
 
-SUBDIRS =			\
-	icons			\
+SUBDIRS =	\
+	icons	\
+	sounds	\
 	$(NULL)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/mate-volume-control/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 05a9700..05a9700 100644
--- a/mate-volume-control/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
diff --git a/mate-volume-control/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index 041fb3b..041fb3b 100644
--- a/mate-volume-control/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-high.png b/data/icons/16x16/status/audio-input-microphone-high.png
index 160d2b8..160d2b8 100644
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-high.png
+++ b/data/icons/16x16/status/audio-input-microphone-high.png
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-low.png b/data/icons/16x16/status/audio-input-microphone-low.png
index b08ab64..b08ab64 100644
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-low.png
+++ b/data/icons/16x16/status/audio-input-microphone-low.png
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-medium.png b/data/icons/16x16/status/audio-input-microphone-medium.png
index 48a4c05..48a4c05 100644
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-medium.png
+++ b/data/icons/16x16/status/audio-input-microphone-medium.png
diff --git a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-muted.png b/data/icons/16x16/status/audio-input-microphone-muted.png
index 7aed52c..7aed52c 100644
--- a/mate-volume-control/data/icons/16x16/status/audio-input-microphone-muted.png
+++ b/data/icons/16x16/status/audio-input-microphone-muted.png
diff --git a/mate-volume-control/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 05a9700..05a9700 100644
--- a/mate-volume-control/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
diff --git a/mate-volume-control/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index 53b0a3a..53b0a3a 100644
--- a/mate-volume-control/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-high.png b/data/icons/22x22/status/audio-input-microphone-high.png
index ca3770f..ca3770f 100644
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-high.png
+++ b/data/icons/22x22/status/audio-input-microphone-high.png
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-low.png b/data/icons/22x22/status/audio-input-microphone-low.png
index 75d0612..75d0612 100644
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-low.png
+++ b/data/icons/22x22/status/audio-input-microphone-low.png
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-medium.png b/data/icons/22x22/status/audio-input-microphone-medium.png
index c1efeb5..c1efeb5 100644
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-medium.png
+++ b/data/icons/22x22/status/audio-input-microphone-medium.png
diff --git a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-muted.png b/data/icons/22x22/status/audio-input-microphone-muted.png
index 9f3dd3c..9f3dd3c 100644
--- a/mate-volume-control/data/icons/22x22/status/audio-input-microphone-muted.png
+++ b/data/icons/22x22/status/audio-input-microphone-muted.png
diff --git a/mate-volume-control/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 05a9700..05a9700 100644
--- a/mate-volume-control/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
diff --git a/mate-volume-control/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index 9ea93cd..9ea93cd 100644
--- a/mate-volume-control/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-high.png b/data/icons/24x24/status/audio-input-microphone-high.png
index fe10ab2..fe10ab2 100644
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-high.png
+++ b/data/icons/24x24/status/audio-input-microphone-high.png
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-low.png b/data/icons/24x24/status/audio-input-microphone-low.png
index ee180d8..ee180d8 100644
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-low.png
+++ b/data/icons/24x24/status/audio-input-microphone-low.png
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-medium.png b/data/icons/24x24/status/audio-input-microphone-medium.png
index eb6aa28..eb6aa28 100644
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-medium.png
+++ b/data/icons/24x24/status/audio-input-microphone-medium.png
diff --git a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-muted.png b/data/icons/24x24/status/audio-input-microphone-muted.png
index b969738..b969738 100644
--- a/mate-volume-control/data/icons/24x24/status/audio-input-microphone-muted.png
+++ b/data/icons/24x24/status/audio-input-microphone-muted.png
diff --git a/mate-volume-control/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 05a9700..05a9700 100644
--- a/mate-volume-control/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
diff --git a/mate-volume-control/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index 68afbb7..68afbb7 100644
--- a/mate-volume-control/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-high.png b/data/icons/32x32/status/audio-input-microphone-high.png
index 8bd9d5b..8bd9d5b 100644
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-high.png
+++ b/data/icons/32x32/status/audio-input-microphone-high.png
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-low.png b/data/icons/32x32/status/audio-input-microphone-low.png
index 8a09c9f..8a09c9f 100644
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-low.png
+++ b/data/icons/32x32/status/audio-input-microphone-low.png
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-medium.png b/data/icons/32x32/status/audio-input-microphone-medium.png
index a45c79c..a45c79c 100644
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-medium.png
+++ b/data/icons/32x32/status/audio-input-microphone-medium.png
diff --git a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-muted.png b/data/icons/32x32/status/audio-input-microphone-muted.png
index 8161f1f..8161f1f 100644
--- a/mate-volume-control/data/icons/32x32/status/audio-input-microphone-muted.png
+++ b/data/icons/32x32/status/audio-input-microphone-muted.png
diff --git a/mate-volume-control/data/icons/Makefile.am b/data/icons/Makefile.am
index 67d9cea..119338b 100644
--- a/mate-volume-control/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,11 +1,11 @@
 NULL =
 
-SUBDIRS = \
-	scalable \
-	16x16 \
-	22x22 \
-	24x24 \
-	32x32 \
+SUBDIRS = 		\
+	scalable 	\
+	16x16 		\
+	22x22 		\
+	24x24 		\
+	32x32 		\
 	$(NULL)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/mate
@@ -21,5 +21,4 @@ update-icon-cache:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
-
 -include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 2cf31cf..2cf31cf 100644
--- a/mate-volume-control/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
diff --git a/mate-volume-control/data/icons/scalable/devices/Makefile.am b/data/icons/scalable/devices/Makefile.am
index e22cb77..e22cb77 100644
--- a/mate-volume-control/data/icons/scalable/devices/Makefile.am
+++ b/data/icons/scalable/devices/Makefile.am
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back-testing.svg b/data/icons/scalable/devices/audio-speaker-center-back-testing.svg
index 93afe0b..93afe0b 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-center-back-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back.svg b/data/icons/scalable/devices/audio-speaker-center-back.svg
index 7d278f8..7d278f8 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-back.svg
+++ b/data/icons/scalable/devices/audio-speaker-center-back.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-testing.svg b/data/icons/scalable/devices/audio-speaker-center-testing.svg
index 09f40bc..09f40bc 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-center-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center.svg b/data/icons/scalable/devices/audio-speaker-center.svg
index 886b4b8..886b4b8 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-center.svg
+++ b/data/icons/scalable/devices/audio-speaker-center.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back-testing.svg b/data/icons/scalable/devices/audio-speaker-left-back-testing.svg
index e1618fc..e1618fc 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-left-back-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back.svg b/data/icons/scalable/devices/audio-speaker-left-back.svg
index d7a6f43..d7a6f43 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-back.svg
+++ b/data/icons/scalable/devices/audio-speaker-left-back.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side-testing.svg b/data/icons/scalable/devices/audio-speaker-left-side-testing.svg
index ad0f430..ad0f430 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-left-side-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side.svg b/data/icons/scalable/devices/audio-speaker-left-side.svg
index 4851454..4851454 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-side.svg
+++ b/data/icons/scalable/devices/audio-speaker-left-side.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-testing.svg b/data/icons/scalable/devices/audio-speaker-left-testing.svg
index 7b9316f..7b9316f 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-left-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left.svg b/data/icons/scalable/devices/audio-speaker-left.svg
index 1ee3869..1ee3869 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-left.svg
+++ b/data/icons/scalable/devices/audio-speaker-left.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back-testing.svg b/data/icons/scalable/devices/audio-speaker-right-back-testing.svg
index 0f633a9..0f633a9 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-right-back-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back.svg b/data/icons/scalable/devices/audio-speaker-right-back.svg
index ba1dead..ba1dead 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-back.svg
+++ b/data/icons/scalable/devices/audio-speaker-right-back.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side-testing.svg b/data/icons/scalable/devices/audio-speaker-right-side-testing.svg
index 577dd86..577dd86 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-right-side-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side.svg b/data/icons/scalable/devices/audio-speaker-right-side.svg
index be6a746..be6a746 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-side.svg
+++ b/data/icons/scalable/devices/audio-speaker-right-side.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-testing.svg b/data/icons/scalable/devices/audio-speaker-right-testing.svg
index 3a4e903..3a4e903 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right-testing.svg
+++ b/data/icons/scalable/devices/audio-speaker-right-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right.svg b/data/icons/scalable/devices/audio-speaker-right.svg
index bde2e35..bde2e35 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-speaker-right.svg
+++ b/data/icons/scalable/devices/audio-speaker-right.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer-testing.svg b/data/icons/scalable/devices/audio-subwoofer-testing.svg
index 6ae74ba..6ae74ba 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer-testing.svg
+++ b/data/icons/scalable/devices/audio-subwoofer-testing.svg
diff --git a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer.svg b/data/icons/scalable/devices/audio-subwoofer.svg
index dbed916..dbed916 100644
--- a/mate-volume-control/data/icons/scalable/devices/audio-subwoofer.svg
+++ b/data/icons/scalable/devices/audio-subwoofer.svg
diff --git a/mate-volume-control/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index c42c14e..c42c14e 100644
--- a/mate-volume-control/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-high.svg b/data/icons/scalable/status/audio-input-microphone-high.svg
index fa30895..fa30895 100644
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-high.svg
+++ b/data/icons/scalable/status/audio-input-microphone-high.svg
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-low.svg b/data/icons/scalable/status/audio-input-microphone-low.svg
index 2aec722..2aec722 100644
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-low.svg
+++ b/data/icons/scalable/status/audio-input-microphone-low.svg
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-medium.svg b/data/icons/scalable/status/audio-input-microphone-medium.svg
index ba8b5a4..ba8b5a4 100644
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-medium.svg
+++ b/data/icons/scalable/status/audio-input-microphone-medium.svg
diff --git a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-muted.svg b/data/icons/scalable/status/audio-input-microphone-muted.svg
index 962b4de..962b4de 100644
--- a/mate-volume-control/data/icons/scalable/status/audio-input-microphone-muted.svg
+++ b/data/icons/scalable/status/audio-input-microphone-muted.svg
diff --git a/mate-volume-control/data/mate-volume-control-applet.desktop.in b/data/mate-volume-control-applet.desktop.in
index 8d4208f..8d4208f 100644
--- a/mate-volume-control/data/mate-volume-control-applet.desktop.in
+++ b/data/mate-volume-control-applet.desktop.in
diff --git a/mate-volume-control/data/mate-volume-control.desktop.in.in b/data/mate-volume-control.desktop.in.in
index 60708a4..60708a4 100644
--- a/mate-volume-control/data/mate-volume-control.desktop.in.in
+++ b/data/mate-volume-control.desktop.in.in
diff --git a/sound-theme/sounds/Makefile.am b/data/sounds/Makefile.am
index 0c31fe7..0c31fe7 100644
--- a/sound-theme/sounds/Makefile.am
+++ b/data/sounds/Makefile.am
diff --git a/sound-theme/sounds/bark.ogg b/data/sounds/bark.ogg
index 480950c..480950c 100644
--- a/sound-theme/sounds/bark.ogg
+++ b/data/sounds/bark.ogg
diff --git a/sound-theme/sounds/drip.ogg b/data/sounds/drip.ogg
index 144d2b3..144d2b3 100644
--- a/sound-theme/sounds/drip.ogg
+++ b/data/sounds/drip.ogg
diff --git a/sound-theme/sounds/glass.ogg b/data/sounds/glass.ogg
index 902a3c8..902a3c8 100644
--- a/sound-theme/sounds/glass.ogg
+++ b/data/sounds/glass.ogg
diff --git a/sound-theme/sounds/mate-sounds-default.xml.in.in b/data/sounds/mate-sounds-default.xml.in.in
index 517c619..517c619 100644
--- a/sound-theme/sounds/mate-sounds-default.xml.in.in
+++ b/data/sounds/mate-sounds-default.xml.in.in
diff --git a/sound-theme/sounds/sonar.ogg b/data/sounds/sonar.ogg
index 77aadec..77aadec 100644
--- a/sound-theme/sounds/sonar.ogg
+++ b/data/sounds/sonar.ogg
diff --git a/man/mate-volume-control-applet.1 b/man/mate-volume-control-applet.1
index b13619f..35fa1a4 100644
--- a/man/mate-volume-control-applet.1
+++ b/man/mate-volume-control-applet.1
@@ -7,7 +7,7 @@
 .SH "SYNOPSIS"
 .B mate-volume-control [OPTIONS]
 .SH "DESCRIPTION"
-The MATE Volume Control Applet is used with Pulseaudio for adjusting audio levels from the notification area.
+The MATE Volume Control Applet is used for adjusting audio levels from the notification area.
 .SH "OPTIONS"
 .TP
 \fB\-\-version\fR
@@ -30,7 +30,7 @@ Print all command line options.
 \fB\-\-help\-gtk\fR
 Print GTK+ options.
 .SH "BUGS"
-.SS Should you encounter any bugs, they may be reported at: 
+.SS Should you encounter any bugs, they may be reported at:
 http://github.com/mate-desktop/mate-media/issues
 .SH "AUTHORS"
 .SS This Manual Page has been written for the MATE Desktop Environment by:
diff --git a/mate-volume-control/AUTHORS b/mate-volume-control/AUTHORS
deleted file mode 100644
index 3f6dd9e..0000000
--- a/mate-volume-control/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-William Jon McCann <[email protected]>
-Bastien Nocera <[email protected]>
diff --git a/mate-volume-control/ChangeLog.pre-2-26 b/mate-volume-control/ChangeLog.pre-2-26
deleted file mode 100644
index 8b38808..0000000
--- a/mate-volume-control/ChangeLog.pre-2-26
+++ /dev/null
@@ -1,1245 +0,0 @@
-2009-03-16  Marc-André Lureau  <[email protected]>
-
-	* src/Makefile.am (*_SOURCES): Fix make dist. Include gvc-log.h.
-
-2009-03-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (on_stream_decibel_notify),
-	(gvc_stream_status_icon_set_mixer_stream): Also update the
-	tooltip when decibels change, fixes the dB value pretty much
-	always being wrong (the code notifies of the changed dB after the
-	changed volume) (Closes: #575093)
-
-2009-03-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new),
-	(gvc_balance_bar_set_balance_type), (gvc_balance_bar_set_property),
-	(gvc_balance_bar_class_init), (on_adjustment_value_changed),
-	(gvc_balance_bar_init), (gvc_balance_bar_new): Fix use of the
-	zero_adjustment GtkAdjustment in slider callbacks, export
-	gvc_channel_bar_scroll
-	* src/gvc-balance-bar.h: Export gvc_channel_bar_scroll
-
-	* src/gvc-stream-status-icon.c (on_status_icon_scroll_event):
-	Use gvc_channel_bar_scroll instead of our own code
-
-	(Closes: #564313)
-
-2009-03-06  Matthias Clasen  <[email protected]>
-
-	* src/applet-main.c:
-	* src/dialog-main.c: Wire up --debug
-
-	* src/gvc-log.[hc]: Add some trivial logging infrastructure
-
-	* src/Makefile.am: Add gvc-log.c
-
-2009-03-04  Bastien Nocera  <[email protected]>
-
-	* src/Makefile.am: Link to libsoundtheme.la, not using
-	-l against a static lib
-
-==================== 2.25.92 ====================
-
-2009-02-23  Matthias Clasen  <[email protected]>
-
-	Bug 572665 – update sensitivity of input feedback checkbox
-
-	* src/gvc-sound-theme-chooser.c (update_theme): Make the window
-	and button sounds button insensitive too.
-
-2009-02-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new),
-	(on_scale_button_press_event), (on_scale_button_release_event),
-	(on_scale_scroll_event): Make the balance bar instant-apply
-	(Closes: #566423)
-
-2009-02-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (popup_dock): Fix warning
-
-2009-02-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (popup_dock),
-	(gvc_stream_status_icon_constructor): Patch from Yanko Kaneti
-	<[email protected]> to fix the dock showing up off-screen
-	when the applet is at the bottom of the screen and is popped
-	up for the first time (Closes: #564312)
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_source): Don't filter out
-	non-hardware sources, only ignore sink monitors
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink): Don't filter out
-	sinks with PA_SINK_HARDWARE, otherwise things like network sinks
-	(Airport Express?) won't show up in the volume capplet
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-bar.c (on_scale_scroll_event),
-	(gvc_channel_bar_set_is_amplified), (gvc_channel_bar_set_property),
-	(gvc_channel_bar_get_property), (gvc_channel_bar_class_init),
-	(gvc_channel_bar_init):
-	* src/gvc-channel-bar.h: Add "is-amplified" property. In this mode,
-	the volume can be set above 100% (150% tops actually) for inputs
-	that support giving us the dB information
-	* src/gvc-mixer-dialog.c (on_mixer_control_default_source_changed),
-	(add_stream): Disconnect the value-changed signal, and
-	reconnect it when we're done setting is_amplified for source streams
-	that support giving dB info
-	(Closes: #567536)
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-map.c (gvc_channel_map_can_balance),
-	(set_from_pa_map):
-	* src/gvc-channel-map.h: Add API to detect whether a channel
-	map supports balancing
-	* src/gvc-mixer-dialog.c (update_output_settings): De-sensitivise
-	the balance bar if the output doesn't support balacing
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (on_adjustment_value_changed):
-	Remove fixed FIXME
-
-2009-02-17  Bastien Nocera  <[email protected]>
-
-	* src/applet-main.c: Remove unused macro
-
-2009-02-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (gvc_stream_collate): Fix run-time
-	warning when there's no name for a stream, such as some events
-	from libcanberra
-
-2009-02-12  Bastien Nocera  <[email protected]>
-
-	* src/dialog-main.c (on_control_ready), (warning_dialog_answered),
-	(dialog_popup_timeout), (main): When PulseAudio isn't running,
-	or takes a long time to connect to, popup a dialogue telling
-	the user what we're waiting for, and the ability to cancel
-	(Closes: #566835)
-
-2009-02-11  Bastien Nocera  <[email protected]>
-
-	* src/applet-main.c (main): Use libunique instead of D-Bus
-	and refuse to run if an applet is already running
-	* src/dialog-main.c (message_received_cb), (on_control_ready),
-	(main): present the application when it's already running
-	(Closes: #542727)
-
-2009-02-11  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-bar.c (on_scale_button_release_event):
-	* src/gvc-sound-theme-chooser.c (play_preview_for_path):
-	* src/gvc-sound-theme-editor.c (play_sound_preview),
-	(play_sound_at_path): Don't call ca_gtk_context_get () when
-	we're not going to use the returned context, set the
-	application id for all the calls to ca_gtk_play_*()
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Correct the label to mention that there are no recording apps as well
-	(Closes: #568900)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* data/Makefile.am: Install the applet's desktop file in the
-	xdg autostart directory (Closes: #570114)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_source_output):
-	* src/gvc-mixer-dialog.c (add_stream): Show recording applications
-	in addition to playback applications, use the microphone icon
-	for those applications (Closes: #568900)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icons):
-	* src/gvc-mixer-control.c (set_application_id_from_proplist),
-	(update_sink_input), (update_source_output):
-	* src/gvc-mixer-dialog.c (create_monitor_stream_for_source):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_application_id),
-	(gvc_mixer_stream_set_application_id),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init), (gvc_mixer_stream_finalize):
-	* src/gvc-mixer-stream.h: Set the org.mate.VolumeControl application
-	ID for the input peak monitor, and ignore it when checking whether
-	an application is using the input. Also ignore Pavucontrol.
-	Stops the microphone showing up in the applet when the capplet is
-	running (Closes: #565146)
-
-2009-02-10  Bastien Nocera  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icons): Revert accidentally
-	committing the rejected patch for bug #565146
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (gvc_balance_bar_init): Make sure the balance
-	bar stays Left to Right, so that the Left balance is really on the
-	left
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new), (gvc_balance_bar_init):
-	Patch from Luca Ferretti <[email protected]>, to use the new GTK+
-	scale marks for the balance widget (Closes: #565144)
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/dialog-main.c (on_dialog_response), (on_dialog_close):
-	Use gtk_main_quit () instead of exit (), so that all the
-	objects are unref'ed cleanly
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/dialog-main.c (on_dialog_response), (on_dialog_close),
-	(on_control_ready): Exit when Esc is pressed
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_finalize):
-	Remove any lingering timeouts when finalizing the object
-
-2009-01-26  Bastien Nocera  <[email protected]>
-
-	* src/Makefile.am: Fix automake warning
-
-	* src/gvc-applet.c (maybe_show_status_icons):
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-stream-status-icon.c (on_status_icon_scroll_event),
-	(update_icon), (gvc_stream_status_icon_init): Remove ifdef's
-	from the volume control code, as GTK+ 2.15.1 is now required
-	(Closes: #564318)
-
-2009-01-24  Luca Ferretti  <[email protected]>
-
-	* data/mate-volume-control.desktop.in.in:
-	Icon name is mate-volume-control, not mate-sound-properties.
-
-2009-01-23  Bastien Nocera  <[email protected]>
-
-	* data/icons/16x16/apps/Makefile.am:
-	* data/icons/22x22/apps/Makefile.am:
-	* data/icons/24x24/apps/Makefile.am:
-	* data/icons/32x32/apps/Makefile.am:
-	* data/icons/48x48/apps/Makefile.am:
-	* data/icons/scalable/apps/Makefile.am:
-	Install the application icon in the global
-	icon theme, not in our private directory
-	(Closes: #568635)
-
-	* data/icons/Makefile.am: Don't run gtk-update-icon-cache
-	for a private icons directory
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* data/Makefile.am:
-	* data/icons/48x48/apps/Makefile.am:
-	* data/icons/Makefile.am:
-	* src/Makefile.am: Fix distcheck
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(on_scale_button_press_event), (on_scale_button_release_event),
-	(on_scale_scroll_event), (gvc_channel_bar_init): Move the
-	setup of the press and release button events to _scale_box_new(),
-	otherwise it's not handled with horizontal scales.
-	When scrolling with the mouse wheel, swap the up/down directions
-	to work as expected (Closes: #567034)
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-control.c (set_is_event_stream_from_proplist),
-	(update_sink_input):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_is_event_stream),
-	(gvc_mixer_stream_set_is_event_stream),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h: Add the "is-event-stream" property,
-	to check whether the role of a stream is to play an event
-
-	* src/gvc-mixer-dialog.c (add_stream): Don't show event streams
-	in the applications tab (Closes: #565145)
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Add Close button, and change the spacing around it to
-	match existing capplets (Closes: #564314)
-
-2009-01-20  Bastien Nocera  <[email protected]>
-
-	* data/mate-volume-control-applet.desktop.in: Start
-	mate-volume-control after the panel, not at the same time,
-	spotted by Chris Coulson (Closes: #568320)
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Don't show no apps message if there are apps.
-	Fixes #567250
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-stream-status-icon.c
-	(gvc_stream_status_icon_constructor):
-	Reduce border around volume slider dock
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(on_scale_button_press_event), (on_scale_button_release_event),
-	(on_zero_adjustment_value_changed), (gvc_channel_bar_init):
-	Make volume sliders instantaneous.
-
-	Patch from: Bastien Nocera  <[email protected]>
-	Fixes #564313
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (on_menu_mute_toggled),
-	(on_status_icon_popup_menu):
-	Add a mute toggle item to the context menu.
-
-	Patch from: Paolo Borelli <[email protected]>
-	Fixes #567510
-
-2009-01-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icons):
-	Don't leak a list of sources.
-
-	Patch from: Paolo Borelli <[email protected]>
-	Fixes #567514
-
-2009-01-10  William Jon McCann  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new):
-	Don't paint the scale trough.
-	Patch from: Matthias Clasen  <[email protected]>
-	Fixes part of #565144
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (popup_dock):
-	addresses a bunch of positioning problems
-	Patch from: Matthias Clasen  <[email protected]>
-	Fixes #564312
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (on_treeview_selection_changed):
-	Check for null selection.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* data/sounds/Makefile.am:
-	* data/sounds/mate-sounds-default.xml.in.in:
-	Add drip, glass, and sonar sounds.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* data/Makefile.am:
-	* data/sounds/Makefile.am:
-	* data/sounds/mate-sounds-default.xml.in.in:
-	* src/Makefile.am:
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (set_combox_for_theme_name),
-	(xml_get_and_trim_names), (populate_model_from_node),
-	(populate_model_from_file), (populate_model_from_dir),
-	(save_alert_sounds), (update_alert_model), (update_alert),
-	(on_alert_toggled), (play_preview_for_path),
-	(create_alert_treeview), (get_file_type),
-	(update_alerts_from_theme_name), (update_theme),
-	(gvc_sound_theme_chooser_init):
-	* src/sound-theme-file-utils.c (custom_theme_dir_is_empty),
-	(delete_old_files), (delete_disabled_files), (add_disabled_file),
-	(add_custom_file), (create_custom_theme):
-	* src/sound-theme-file-utils.h:
-	Add sound set.  Properly set the active alert sound in the
-	model.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (on_combobox_changed),
-	(set_input_feedback_enabled), (update_theme), (on_alert_toggled),
-	(play_preview_for_path), (on_treeview_row_activated),
-	(on_treeview_selection_changed), (create_alert_treeview),
-	(gvc_sound_theme_chooser_constructor),
-	(gvc_sound_theme_chooser_init):
-	* src/gvc-sound-theme-editor.c (theme_changed_custom_reinit),
-	(on_theme_changed), (load_index_theme_name), (sound_theme_in_dir),
-	(add_theme_to_store), (set_theme_name), (audible_bell_foreach),
-	(set_audible_bell_enabled), (input_feedback_foreach),
-	(set_input_feedback_enabled), (get_file_type),
-	(theme_changed_custom_init), (update_theme),
-	(setup_theme_selector), (play_sound_preview), (get_sound_filename),
-	(count_customised_sounds), (save_sounds), (save_custom_theme),
-	(dump_theme), (on_setting_column_edited), (fill_custom_model),
-	(on_combobox_editing_started), (play_sound_at_path),
-	(setting_set_func), (activatable_cell_renderer_pixbuf_activate),
-	(activatable_cell_renderer_pixbuf_init),
-	(activatable_cell_renderer_pixbuf_class_init),
-	(setup_theme_custom_selector),
-	(gvc_sound_theme_editor_constructor),
-	(gvc_sound_theme_editor_class_init), (on_click_feedback_toggled),
-	(on_key_changed), (on_treeview_row_activated),
-	(constrain_list_size), (setup_list_size_constraint),
-	(gvc_sound_theme_editor_init), (gvc_sound_theme_editor_finalize),
-	(gvc_sound_theme_editor_new):
-	* src/gvc-sound-theme-editor.h:
-	Simplify the theme selection.  Move the ability to
-	customize the sound theme into a separate widget.  We
-	should add a Customize button to access it.
-	This new approach will mirror the way we handle
-	wallpapers.  Next thing to do is to add a set
-	of standard alert sounds that one can choose from.
-	And have the widget customize the selected theme to
-	use them.
-
-2008-12-21  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Move the sound effects tab back to the first one.
-
-2008-12-19  Bastien Nocera  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Move the sound effects tab to be the last one
-
-2008-12-19  Bastien Nocera  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (setup_theme_custom_selector):
-	Change the ellipsising to be at the start
-
-2008-12-19  Bastien Nocera  <[email protected]>
-
-	* data/mate-volume-control.desktop.in.in:
-	Add a .desktop file to launch g-v-c from the
-	control-center (and preferences menu)
-
-	* data/Makefile.am: changes for the above
-
-	* data/icons/16x16/Makefile.am:
-	* data/icons/16x16/apps/*:
-	* data/icons/22x22/Makefile.am:
-	* data/icons/22x22/apps/*:
-	* data/icons/24x24/Makefile.am:
-	* data/icons/24x24/apps/*:
-	* data/icons/32x32/Makefile.am:
-	* data/icons/32x32/apps/*:
-	* data/icons/48x48/*:
-	* data/icons/scalable/Makefile.am:
-	* data/icons/scalable/apps/*:
-	Add icons for the .desktop file
-
-2008-12-18  Bastien Nocera  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (setup_theme_custom_selector):
-	Set the first column's text to be ellipsised, and expanded,
-	fixes the window resizing on startup, but still some unsightly
-	resizing in the treeview itself
-
-2008-12-17  Bastien Nocera  <[email protected]>
-
-	* AUTHORS: Add myself, having written much of src/*theme*.[ch]
-
-2008-12-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_size_allocate):
-	Recalculate layout for allocation.
-
-2008-12-16  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (layout_changed), (reset_max_peak),
-	(bar_calc_layout), (update_peak_value), (update_rms_value),
-	(gvc_level_bar_expose):
-	Separate the layout calculation from the draw.
-	Only queue a redraw if the layout actually changes.
-	Reduces cpu usage considerably.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_expose):
-	Compress expose event queue.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-balance-bar.c (_scale_box_new):
-	Add left and right labels.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (gvc_level_bar_expose):
-	Round corners a bit more.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/gvc-level-bar.c (reset_max_peak), (update_peak_value),
-	(gvc_level_bar_expose):
-	Add peak of level indicator.
-
-2008-12-14  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-level-bar.c (fraction_from_adjustment),
-	(update_peak_value), (update_rms_value),
-	(gvc_level_bar_get_orientation), (gvc_level_bar_set_orientation),
-	(on_peak_adjustment_value_changed),
-	(on_rms_adjustment_value_changed),
-	(gvc_level_bar_set_peak_adjustment),
-	(gvc_level_bar_set_rms_adjustment),
-	(gvc_level_bar_get_peak_adjustment),
-	(gvc_level_bar_get_rms_adjustment), (gvc_level_bar_set_scale),
-	(gvc_level_bar_set_property), (gvc_level_bar_get_property),
-	(gvc_level_bar_constructor), (gvc_level_bar_size_request),
-	(gvc_level_bar_size_allocate), (curved_rectangle),
-	(gvc_level_bar_expose), (gvc_level_bar_class_init),
-	(gvc_level_bar_init), (gvc_level_bar_finalize),
-	(gvc_level_bar_new):
-	* src/gvc-level-bar.h:
-	* src/gvc-mixer-dialog.c (update_input_peak),
-	(gvc_mixer_dialog_constructor):
-	* src/rb-segmented-bar.c:
-	* src/rb-segmented-bar.h:
-	Remove rb-segmented-bar and add a new GvcLevelBar.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-balance-bar.c (_scale_box_new),
-	(gvc_balance_bar_set_size_group),
-	(gvc_balance_bar_set_channel_map), (gvc_balance_bar_set_property),
-	(gvc_balance_bar_get_property), (gvc_balance_bar_constructor),
-	(gvc_balance_bar_class_init), (on_left), (on_right),
-	(on_adjustment_value_changed), (gvc_balance_bar_init),
-	(gvc_balance_bar_finalize), (gvc_balance_bar_new):
-	* src/gvc-balance-bar.h:
-	* src/gvc-channel-map.c (gvc_channel_map_class_init),
-	(gvc_channel_map_gains_changed), (set_from_pa_map):
-	* src/gvc-channel-map.h:
-	* src/gvc-mixer-control.c (gvc_mixer_control_set_default_sink),
-	(gvc_mixer_control_set_default_source),
-	(update_default_source_from_name), (update_default_sink_from_name),
-	(update_sink), (update_source), (update_sink_input),
-	(update_event_role_stream):
-	* src/gvc-mixer-dialog.c (update_output_settings),
-	(on_mixer_control_default_sink_changed), (add_stream),
-	(on_output_radio_toggled), (gvc_mixer_dialog_constructor):
-	* src/gvc-mixer-sink-input.c (gvc_mixer_sink_input_change_volume):
-	* src/gvc-mixer-sink.c (gvc_mixer_sink_change_volume):
-	* src/gvc-mixer-source.c (gvc_mixer_source_change_volume):
-	* src/gvc-mixer-stream.c (on_channel_map_gains_changed),
-	(gvc_mixer_stream_set_channel_map):
-	Add output balance control.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* AUTHORS: updated email address
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-channel-map.c (gvc_channel_map_get_num_channels),
-	(gvc_channel_map_get_gains), (gvc_channel_map_get_positions),
-	(gvc_channel_map_class_init), (gvc_channel_map_init),
-	(gvc_channel_map_finalize), (gvc_channel_map_new),
-	(set_from_pa_map), (gvc_channel_map_new_from_pa_channel_map):
-	* src/gvc-channel-map.h:
-	* src/gvc-mixer-control.c (update_sink), (update_source),
-	(update_sink_input), (update_source_output):
-	* src/gvc-mixer-event-role.c (update_settings),
-	(gvc_mixer_event_role_new):
-	* src/gvc-mixer-sink-input.c (gvc_mixer_sink_input_change_volume),
-	(gvc_mixer_sink_input_new):
-	* src/gvc-mixer-sink-input.h:
-	* src/gvc-mixer-sink.c (gvc_mixer_sink_change_volume),
-	(gvc_mixer_sink_new):
-	* src/gvc-mixer-sink.h:
-	* src/gvc-mixer-source-output.c (gvc_mixer_source_output_new):
-	* src/gvc-mixer-source-output.h:
-	* src/gvc-mixer-source.c (gvc_mixer_source_change_volume),
-	(gvc_mixer_source_new):
-	* src/gvc-mixer-source.h:
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_channel_map),
-	(gvc_mixer_stream_set_channel_map),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h:
-	Add a ChannelMap class that we can use to manipulate channel
-	volume levels.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new), (update_layout),
-	(gvc_channel_bar_set_size_group),
-	(gvc_channel_bar_set_orientation), (gvc_channel_bar_constructor),
-	(gvc_channel_bar_init):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (create_bar), (add_stream),
-	(gvc_mixer_dialog_constructor):
-	Don't put the end box in the size group for app channel bars.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream), (remove_stream),
-	(gvc_mixer_dialog_constructor):
-	Show explanation when no apps are playing.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-channel-bar.c (_scale_box_new):
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_pa_context),
-	(update_default_source_from_name):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (update_input_peak), (update_input_meter),
-	(on_monitor_suspended_callback), (on_monitor_read_callback),
-	(create_monitor_stream_for_source),
-	(on_mixer_control_default_source_changed), (add_stream),
-	(gvc_mixer_dialog_constructor):
-	* src/rb-segmented-bar.c (rb_segment_new), (rb_segment_free),
-	(rb_segmented_bar_init), (rb_segmented_bar_class_init),
-	(rb_segmented_bar_finalize), (rb_segmented_bar_get_property),
-	(rb_segmented_bar_set_property),
-	(rb_segmented_bar_default_value_formatter),
-	(rb_segmented_bar_size_request), (create_adapt_layout),
-	(compute_layout_size), (rb_segmented_bar_size_allocate),
-	(rb_segmented_bar_add_segment),
-	(rb_segmented_bar_add_segment_default_color),
-	(rb_segmented_bar_update_segment), (draw_rounded_rectangle),
-	(rb_segmented_bar_render_segments), (modula), (hsb_from_color),
-	(color_from_hsb), (color_shade), (make_segment_gradient),
-	(rb_segmented_bar_render_strokes), (rb_segmented_bar_render),
-	(rb_segmented_bar_render_labels), (rb_segmented_bar_expose),
-	(rb_segmented_bar_new), (rb_segmented_bar_set_value_formatter):
-	* src/rb-segmented-bar.h:
-	Add input level monitor.
-
-2008-12-13  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(gvc_channel_bar_set_orientation):
-	Use the same size group for the start and end of
-	the channel bar.
-
-2008-12-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (get_sound_filename):
-	Set a parent for the file chooser
-
-2008-12-12  Bastien Nocera  <[email protected]>
-
-	* src/gvc-stream-status-icon.c (update_icon): Fix
-	last commit, we need to use commas, not dots to separate
-	major, minor and micro versions
-
-2007-12-12  Matthias Clasen  <[email protected]>
-
-        Bug 564176 – dependency on API from gtk+ trunk
-
-        * mate-volume-control/src/gvc-stream-status-icon.c: Don't use
-        GTK+ 2.16 API unconditionally. Reported by Frederic Peters
-
-2008-12-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink), (update_source):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_decibel),
-	(gvc_mixer_stream_set_decibel), (gvc_mixer_stream_get_can_decibel),
-	(gvc_mixer_stream_set_can_decibel),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h:
-	* src/gvc-stream-status-icon.c (update_icon):
-	Add decibel level support.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-applet.c (maybe_show_status_icons), (gvc_applet_start),
-	(on_control_stream_removed), (on_control_stream_added),
-	(gvc_applet_constructor):
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_source_outputs),
-	(update_source), (update_sink_input), (update_source_output),
-	(update_event_role_stream):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-source-output.c
-	(gvc_mixer_source_output_change_volume),
-	(gvc_mixer_source_output_change_is_muted),
-	(gvc_mixer_source_output_constructor),
-	(gvc_mixer_source_output_class_init),
-	(gvc_mixer_source_output_init), (gvc_mixer_source_output_finalize),
-	(gvc_mixer_source_output_new):
-	* src/gvc-mixer-source-output.h:
-	* src/gvc-stream-status-icon.c (update_icon),
-	(on_status_icon_visible_notify), (gvc_stream_status_icon_init):
-	Show/hide input level status icon based on presence of
-	a "source output" stream.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (gvc_channel_bar_set_low_icon_name),
-	(gvc_channel_bar_set_high_icon_name),
-	(gvc_channel_bar_set_property), (gvc_channel_bar_get_property),
-	(gvc_channel_bar_class_init), (gvc_channel_bar_init),
-	(gvc_channel_bar_finalize):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor),
-	(gvc_mixer_dialog_set_page):
-	Use the new input icons in the dialog.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/applet-main.c (main):
-	* src/dialog-main.c (main):
-	Append the icon search path to the icon theme.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c:
-	Use new icons.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* data/Makefile.am:
-	* data/icons/*:
-	Add some input level icons from Mike Langlie.  Just
-	an initial draft.
-
-2008-12-11  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-applet.c (gvc_applet_start), (gvc_applet_dispose),
-	(update_default_source), (update_default_sink), (on_control_ready),
-	(on_control_default_sink_changed),
-	(on_control_default_source_changed), (gvc_applet_constructor),
-	(gvc_applet_class_init), (gvc_applet_init), (gvc_applet_finalize):
-	* src/gvc-stream-status-icon.c (on_adjustment_value_changed),
-	(popup_dock), (on_status_icon_activate),
-	(on_menu_activate_open_volume_control),
-	(on_status_icon_popup_menu), (on_status_icon_scroll_event),
-	(gvc_icon_release_grab), (on_dock_button_press), (popdown_dock),
-	(gvc_icon_grab_notify), (on_dock_grab_notify),
-	(on_dock_grab_broken_event), (on_dock_key_release),
-	(maybe_show_status_icon), (update_icon),
-	(gvc_stream_status_icon_set_icon_names), (on_stream_volume_notify),
-	(on_stream_is_muted_notify),
-	(gvc_stream_status_icon_set_display_name),
-	(gvc_stream_status_icon_set_mixer_stream),
-	(gvc_stream_status_icon_set_property),
-	(gvc_stream_status_icon_get_property), (on_bar_is_muted_notify),
-	(gvc_stream_status_icon_constructor),
-	(gvc_stream_status_icon_dispose),
-	(gvc_stream_status_icon_class_init), (gvc_stream_status_icon_init),
-	(gvc_stream_status_icon_finalize), (gvc_stream_status_icon_new):
-	* src/gvc-stream-status-icon.h:
-	Create a stream-status-icon class.  Create a status icon
-	for input stream.  Todo: only show input status icon
-	when an application is recording, use microphone images.
-
-2008-12-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (gvc_channel_bar_init):
-	Make label left aligned.
-
-2008-12-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink), (update_sink_input),
-	(update_client), (remove_client), (gvc_mixer_control_init):
-	Use application/client name instead of stream name.
-
-2008-12-05  Marc-André Lureau  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_set_page):
-	Added --page argument for compatibility reasons (used by g-s-r,
-	for instance). Closes: #563289
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink_input),
-	(update_event_role_stream):
-	Add debug for event stuff.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (on_stream_volume_notify),
-	(on_stream_is_muted_notify):
-	Fix crash when can't find a bar for stream.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (update_default_input),
-	(update_default_output), (on_mixer_control_default_sink_changed),
-	(on_mixer_control_default_source_changed), (add_stream),
-	(on_input_radio_toggled), (on_output_radio_toggled),
-	(create_stream_treeview), (gvc_mixer_dialog_constructor):
-	Use radio buttons instead of selection to change default in/out.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new), (gvc_channel_bar_new):
-	* src/gvc-mixer-control.c (_set_default_source),
-	(_set_default_sink):
-	Make range update policy discontinuous.
-
-2008-11-19  William Jon McCann  <[email protected]>
-
-	* src/gvc-sound-theme-chooser.c (constrain_list_size),
-	(setup_list_size_constraint), (gvc_sound_theme_chooser_init):
-	Make the initial size of the scrolled window more reasonable.
-
-2008-11-18  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (create_stream_treeview):
-	* src/gvc-sound-theme-chooser.c (play_sound_at_path),
-	(activatable_cell_renderer_pixbuf_activate),
-	(setup_theme_custom_selector), (on_treeview_row_activated),
-	(gvc_sound_theme_chooser_init):
-	Hide treeview headers.  Make double click on tree rows
-	play sound preview.
-
-2008-11-18  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (maybe_show_status_icon), (update_icon),
-	(update_default_sink), (on_control_ready),
-	(on_control_default_sink_changed), (gvc_applet_init):
-	* src/gvc-mixer-control.c (remove_stream):
-	Hide the status icon when there is no output device.
-
-2008-11-18  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (gvc_mixer_control_set_default_sink),
-	(gvc_mixer_control_set_default_source), (_set_default_source),
-	(_set_default_sink), (_stream_has_name), (find_stream_for_name),
-	(update_default_source_from_name), (update_default_sink_from_name),
-	(update_server), (update_sink), (update_source),
-	(update_sink_input), (gvc_mixer_control_class_init):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (on_mixer_control_default_sink_changed),
-	(on_mixer_control_default_source_changed),
-	(gvc_mixer_dialog_set_mixer_control), (bar_set_stream),
-	(add_stream), (find_stream_by_id), (remove_stream),
-	(on_control_stream_removed), (create_stream_treeview),
-	(on_input_treeview_selection_changed),
-	(on_output_treeview_selection_changed),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_set_property),
-	(gvc_mixer_stream_get_property), (gvc_mixer_stream_class_init):
-	* src/gvc-mixer-stream.h:
-	Add support for changing the default sink and source.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-mixer-control.c (update_event_role_stream):
-	* src/gvc-mixer-dialog.c (create_bar), (add_stream):
-	* src/gvc-mixer-event-role.c (update_settings),
-	(gvc_mixer_event_role_change_volume),
-	(gvc_mixer_event_role_change_is_muted),
-	(gvc_mixer_event_role_set_device),
-	(gvc_mixer_event_role_set_property),
-	(gvc_mixer_event_role_get_property),
-	(gvc_mixer_event_role_constructor),
-	(gvc_mixer_event_role_class_init), (gvc_mixer_event_role_init),
-	(gvc_mixer_event_role_finalize), (gvc_mixer_event_role_new):
-	* src/gvc-mixer-event-role.h:
-	Add event role stream.  Make setting event volume work.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor),
-	(gvc_mixer_dialog_init):
-	* src/gvc-sound-theme-chooser.c (theme_changed_custom_reinit),
-	(on_combobox_changed), (audible_bell_foreach),
-	(set_audible_bell_enabled), (input_feedback_foreach),
-	(set_input_feedback_enabled), (get_file_type),
-	(theme_changed_custom_init), (update_theme),
-	(setup_theme_selector), (count_customised_sounds), (save_sounds),
-	(on_setting_column_edited), (fill_custom_model),
-	(on_combobox_editing_started), (setting_set_func),
-	(setup_theme_custom_selector),
-	(gvc_sound_theme_chooser_constructor), (on_click_feedback_toggled),
-	(on_key_changed), (gvc_sound_theme_chooser_init),
-	(gvc_sound_theme_chooser_new):
-	Simplify the theme chooser a bit.  Remove the visual bell stuff
-	since that should go into the to-be-written Universal Access
-	control panel.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (on_key_changed):
-	Don't assume all changed keys are booleans.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (create_bar), (add_stream),
-	(gvc_mixer_dialog_constructor), (gvc_mixer_dialog_init):
-	Use a separate size group for application streams.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	Switch order of input and output tabs.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new):
-	Add labels to size group instead of scale because
-	using expand/fill widgets in a size group doesn't really
-	work.  And in practice the label is the only variable
-	length widget.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_dispose):
-	Only disconnect signals once.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (gvc_sound_theme_chooser_init):
-	Move alert and input sliders to the top.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (setup_theme_selector),
-	(gvc_sound_theme_chooser_init):
-	Drop the frame and label from the effects chooser.
-	Move the enable effects toggle up to the top.
-
-2008-11-12  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
-	At mpt's suggestion, move the output slider to the top.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink_input),
-	(update_source_output), (update_event_role_stream),
-	(remove_client), (remove_sink), (remove_source),
-	(remove_sink_input), (remove_source_output):
-	* src/gvc-mixer-dialog.c (on_bar_is_muted_notify), (create_bar),
-	(bar_set_stream), (add_stream), (on_control_stream_added),
-	(on_control_stream_removed):
-	Set the associated stream on the bar so mute works.
-	Hush some debugging.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (update_sink), (update_source):
-	* src/gvc-mixer-dialog.c (add_stream):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_get_description),
-	(gvc_mixer_stream_set_description),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_class_init), (gvc_mixer_stream_finalize):
-	* src/gvc-mixer-stream.h:
-	Add descriptions and use them instead of names when
-	displaying sinks and sources.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream):
-	Don't show sinks/source in apps page.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream), (find_stream_by_id),
-	(on_control_stream_removed), (create_stream_treeview):
-	Try to remove streams from models.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream):
-	Also add default streams to tree models.
-
-2008-11-11  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_streams):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (create_bar), (bar_set_stream),
-	(add_stream), (create_stream_treeview),
-	(gvc_mixer_dialog_constructor):
-	Add beginnings of output and input selection.
-
-2008-11-10  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream),
-	(gvc_mixer_dialog_constructor):
-	Don't crash if we don't get a default sink/source.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-control.c (remove_stream), (update_sink_input),
-	(update_event_role_stream):
-	* src/gvc-mixer-dialog.c (on_control_stream_added),
-	(on_control_stream_removed):
-	Fix adding and remove streams.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (_gtk_label_make_bold),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (gvc_sound_theme_chooser_init):
-	Tweak layout and add some placeholder treeviews.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(gvc_channel_bar_set_size_group):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (add_stream), (gvc_mixer_dialog_init):
-	Put all the scales in a size group.  Doesn't seem
-	to work though.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (on_enable_effects_toggled),
-	(on_click_feedback_toggled), (on_audible_bell_toggled),
-	(gvc_mixer_dialog_constructor), (on_key_changed),
-	(gvc_mixer_dialog_init):
-	Hook up the check buttons.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (add_stream),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-sound-theme-chooser.c (setup_theme_selector),
-	(gvc_sound_theme_chooser_init):
-	Fix up some layout.  Hide the theme selector if there is
-	only one.
-
-2008-11-06  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-applet.c (on_menu_activate_open_volume_control),
-	(on_status_icon_popup_menu):
-	* src/gvc-mixer-dialog.c (on_stream_is_muted_notify), (add_stream),
-	(gvc_mixer_dialog_constructor), (gvc_mixer_dialog_new):
-	* src/gvc-sound-theme-chooser.c (theme_changed_custom_reinit),
-	(on_combobox_changed), (load_index_theme_name),
-	(sound_theme_in_dir), (add_theme_to_store),
-	(set_combox_for_theme_name), (on_theme_changed),
-	(setup_theme_selector), (visual_bell_mateconf_to_setting),
-	(visual_bell_setting_to_mateconf), (play_sound_preview),
-	(get_sound_filename), (count_customised_sounds), (save_sounds),
-	(save_custom_theme), (dump_theme), (on_setting_column_edited),
-	(fill_visual_bell_model), (fill_custom_model),
-	(on_combobox_editing_started), (play_sound_at_path),
-	(on_treeview_button_press_event), (setting_set_func),
-	(activatable_cell_renderer_pixbuf_activate),
-	(activatable_cell_renderer_pixbuf_init),
-	(activatable_cell_renderer_pixbuf_class_init),
-	(input_feedback_foreach), (set_input_feedback_enabled),
-	(on_input_feedback_changed), (audible_bell_foreach),
-	(set_audible_bell_enabled), (on_audible_bell_changed),
-	(get_file_type), (theme_changed_custom_init),
-	(setup_theme_custom_selector),
-	(gvc_sound_theme_chooser_constructor),
-	(gvc_sound_theme_chooser_class_init), (_gtk_label_make_bold),
-	(gvc_sound_theme_chooser_init), (gvc_sound_theme_chooser_finalize),
-	(gvc_sound_theme_chooser_new):
-	* src/gvc-sound-theme-chooser.h:
-	* src/sound-theme-file-utils.c (custom_theme_update_time),
-	(custom_theme_dir_path), (directory_delete_recursive),
-	(capplet_file_delete_recursive), (delete_custom_theme_dir),
-	(delete_one_file), (delete_old_files), (delete_disabled_files),
-	(create_one_file), (add_disabled_file), (add_custom_file):
-	* src/sound-theme-file-utils.h:
-	Redesign a bit in order to incorporate the sound properties.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (popup_dock), (on_bar_is_muted_notify),
-	(gvc_applet_init):
-	* src/gvc-channel-bar.c (on_zero_adjustment_value_changed),
-	(update_mute_button), (gvc_channel_bar_init):
-	Fix initial mute setting for applet.  When mute button
-	is not displayed use the "zero" position to indicate
-	muted state.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (gvc_applet_init):
-	* src/gvc-channel-bar.c (_scale_box_new),
-	(gvc_channel_bar_set_orientation), (update_mute_button),
-	(gvc_channel_bar_set_show_mute), (gvc_channel_bar_get_show_mute),
-	(gvc_channel_bar_set_property), (gvc_channel_bar_get_property),
-	(gvc_channel_bar_constructor), (gvc_channel_bar_class_init),
-	(gvc_channel_bar_init):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-dialog.c (add_stream):
-	Hide mute in vertical mode.  Add icons to hint at scale direction
-	in horizontal mode.  Fix orientation changing.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/Makefile.am:
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_default_source),
-	(gvc_mixer_control_get_sources), (remove_stream), (add_stream),
-	(update_sink), (update_source), (update_sink_input),
-	(update_event_role_stream), (remove_sink), (remove_source),
-	(remove_sink_input), (remove_source_output):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (add_stream),
-	(gvc_mixer_dialog_constructor):
-	* src/gvc-mixer-source.c (gvc_mixer_source_change_volume),
-	(gvc_mixer_source_change_is_muted), (gvc_mixer_source_constructor),
-	(gvc_mixer_source_class_init), (gvc_mixer_source_init),
-	(gvc_mixer_source_finalize), (gvc_mixer_source_new):
-	* src/gvc-mixer-source.h:
-	Add support for input streams.  Only show default input and
-	output stream.
-
-2008-11-05  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (gvc_applet_dispose), (on_control_ready):
-	* src/gvc-channel-bar.c (gvc_channel_bar_finalize):
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_event_sink_input),
-	(gvc_mixer_control_get_default_sink),
-	(gvc_mixer_control_lookup_stream_id), (update_sink),
-	(update_sink_input), (update_event_role_stream),
-	(gvc_mixer_control_dispose), (gvc_mixer_control_init):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (on_control_stream_added),
-	(on_control_stream_removed), (gvc_mixer_dialog_constructor),
-	(gvc_mixer_dialog_dispose), (gvc_mixer_dialog_class_init):
-	* src/gvc-mixer-stream.c (gvc_mixer_stream_finalize):
-	Fix leaks.  Use ids instead of indexes when possible.
-	Add method to lookup stream by id.
-
-2008-11-04  Marc-André Lureau  <[email protected]>
-
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor): Compile
-	with gtk+ <= 2.14.
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (on_menu_activate_sounds),
-	(on_status_icon_popup_menu):
-	Add sound properties to menu.
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* src/gvc-applet.c (gvc_applet_init):
-	status-icon scroll events only available in gtk+ 2.15.0
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* Makefile.am (SUBDIRS):
-	Add data dir.
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* data/Makefile.am:
-	* data/mate-volume-control-applet.desktop.in:
-	Install an autostart file for the volume applet
-
-2008-11-03  William Jon McCann  <[email protected]>
-
-	* AUTHORS:
-	* Makefile.am:
-	* src/Makefile.am:
-	* src/applet-main.c (on_bus_name_lost), (acquire_name_on_proxy),
-	(acquire_name), (main):
-	* src/dialog-main.c (on_bus_name_lost), (acquire_name_on_proxy),
-	(acquire_name), (on_dialog_response), (on_control_ready), (main):
-	* src/gvc-applet.c (maybe_show_status_icon), (gvc_applet_start),
-	(gvc_applet_dispose), (gvc_applet_constructor),
-	(gvc_applet_class_init), (on_adjustment_value_changed),
-	(popup_dock), (on_status_icon_activate),
-	(on_menu_activate_open_volume_control),
-	(on_status_icon_popup_menu), (on_status_icon_scroll_event),
-	(gvc_applet_release_grab), (on_dock_button_press), (popdown_dock),
-	(gvc_applet_grab_notify), (on_dock_grab_notify),
-	(on_dock_grab_broken_event), (on_dock_key_release), (update_icon),
-	(on_stream_volume_notify), (on_stream_is_muted_notify),
-	(on_control_ready), (on_bar_is_muted_notify), (gvc_applet_init),
-	(gvc_applet_finalize), (gvc_applet_new):
-	* src/gvc-applet.h:
-	* src/gvc-channel-bar.c (_scale_box_new), (update_image),
-	(update_label), (gvc_channel_bar_set_name),
-	(gvc_channel_bar_set_icon_name), (gvc_channel_bar_set_orientation),
-	(gvc_channel_bar_set_adjustment), (gvc_channel_bar_get_adjustment),
-	(update_mute_button), (gvc_channel_bar_set_is_muted),
-	(gvc_channel_bar_get_is_muted), (gvc_channel_bar_set_property),
-	(gvc_channel_bar_get_property), (gvc_channel_bar_constructor),
-	(gvc_channel_bar_class_init), (on_mute_button_toggled),
-	(gvc_channel_bar_init), (gvc_channel_bar_finalize),
-	(gvc_channel_bar_new):
-	* src/gvc-channel-bar.h:
-	* src/gvc-mixer-control.c (gvc_mixer_control_get_event_sink_input),
-	(gvc_mixer_control_get_default_sink), (listify_hash_values_hfunc),
-	(gvc_stream_collate), (gvc_mixer_control_get_sinks),
-	(gvc_mixer_control_get_sink_inputs), (dec_outstanding),
-	(gvc_mixer_control_is_ready), (update_server), (update_sink),
-	(update_source), (set_icon_name_from_proplist),
-	(update_sink_input), (update_source_output), (update_client),
-	(_pa_context_get_sink_info_cb), (_pa_context_get_source_info_cb),
-	(_pa_context_get_sink_input_info_cb),
-	(_pa_context_get_source_output_info_cb),
-	(_pa_context_get_client_info_cb), (_pa_context_get_server_info_cb),
-	(remove_event_role_stream), (update_event_role_stream),
-	(_pa_ext_stream_restore_read_cb),
-	(_pa_ext_stream_restore_subscribe_cb), (req_update_server_info),
-	(req_update_client_info), (req_update_sink_info),
-	(req_update_source_info), (req_update_sink_input_info),
-	(req_update_source_output_info), (remove_client), (remove_sink),
-	(remove_source), (remove_sink_input), (remove_source_output),
-	(_pa_context_subscribe_cb), (gvc_mixer_control_ready),
-	(_pa_context_state_cb), (gvc_mixer_control_open),
-	(gvc_mixer_control_close), (gvc_mixer_control_dispose),
-	(gvc_mixer_control_constructor), (gvc_mixer_control_class_init),
-	(gvc_mixer_control_init), (gvc_mixer_control_finalize),
-	(gvc_mixer_control_new):
-	* src/gvc-mixer-control.h:
-	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_set_mixer_control),
-	(gvc_mixer_dialog_get_mixer_control),
-	(gvc_mixer_dialog_set_property), (gvc_mixer_dialog_get_property),
-	(on_adjustment_value_changed), (on_bar_is_muted_notify),
-	(lookup_bar_for_stream), (on_stream_volume_notify),
-	(on_stream_is_muted_notify), (save_bar_for_stream), (add_stream),
-	(gvc_mixer_dialog_constructor), (gvc_mixer_dialog_class_init),
-	(gvc_mixer_dialog_init), (gvc_mixer_dialog_finalize),
-	(gvc_mixer_dialog_new):
-	* src/gvc-mixer-dialog.h:
-	* src/gvc-mixer-sink-input.c (gvc_mixer_sink_input_change_volume),
-	(gvc_mixer_sink_input_change_is_muted),
-	(gvc_mixer_sink_input_constructor),
-	(gvc_mixer_sink_input_class_init), (gvc_mixer_sink_input_init),
-	(gvc_mixer_sink_input_finalize), (gvc_mixer_sink_input_new):
-	* src/gvc-mixer-sink-input.h:
-	* src/gvc-mixer-sink.c (gvc_mixer_sink_change_volume),
-	(gvc_mixer_sink_change_is_muted), (gvc_mixer_sink_constructor),
-	(gvc_mixer_sink_class_init), (gvc_mixer_sink_init),
-	(gvc_mixer_sink_finalize), (gvc_mixer_sink_new):
-	* src/gvc-mixer-sink.h:
-	* src/gvc-mixer-stream.c (get_next_stream_serial),
-	(gvc_mixer_stream_get_pa_context), (gvc_mixer_stream_get_index),
-	(gvc_mixer_stream_get_id), (gvc_mixer_stream_get_num_channels),
-	(gvc_mixer_stream_get_volume), (gvc_mixer_stream_set_volume),
-	(gvc_mixer_stream_get_is_muted), (gvc_mixer_stream_get_is_default),
-	(gvc_mixer_stream_set_is_muted), (gvc_mixer_stream_set_is_default),
-	(gvc_mixer_stream_get_name), (gvc_mixer_stream_set_name),
-	(gvc_mixer_stream_get_icon_name), (gvc_mixer_stream_set_icon_name),
-	(gvc_mixer_stream_set_property), (gvc_mixer_stream_get_property),
-	(gvc_mixer_stream_constructor),
-	(gvc_mixer_stream_real_change_volume),
-	(gvc_mixer_stream_real_change_is_muted),
-	(gvc_mixer_stream_change_volume),
-	(gvc_mixer_stream_change_is_muted), (gvc_mixer_stream_class_init),
-	(gvc_mixer_stream_init), (gvc_mixer_stream_finalize):
-	* src/gvc-mixer-stream.h:
-	Initial commit.
-
diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am
index 0c3fa4c..93c1bbc 100644
--- a/mate-volume-control/Makefile.am
+++ b/mate-volume-control/Makefile.am
@@ -1,16 +1,74 @@
 NULL =
 
-SUBDIRS =			\
-	data			\
-	src			\
+bin_PROGRAMS = 						\
+	mate-volume-control-applet			\
+	mate-volume-control				\
 	$(NULL)
 
-EXTRA_DIST = \
-	ChangeLog.pre-2-26	\
+AM_CPPFLAGS =						\
+	$(WARN_CFLAGS)					\
+	$(VOLUME_CONTROL_CFLAGS)			\
+	$(DISABLE_DEPRECATED)				\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"		\
+	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" 	\
+	-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
 	$(NULL)
 
-MAINTAINERCLEANFILES =		\
-	*~			\
+noinst_LTLIBRARIES = libmatevolumecontrol.la
+libmatevolumecontrol_la_SOURCES =			\
+	gvc-channel-bar.h				\
+	gvc-channel-bar.c				\
+	gvc-utils.c 					\
+	gvc-utils.h					\
 	$(NULL)
 
+mate_volume_control_applet_LDADD =			\
+	-lm						\
+	libmatevolumecontrol.la				\
+	$(VOLUME_CONTROL_LIBS)				\
+	$(NULL)
+
+mate_volume_control_applet_SOURCES =			\
+	gvc-stream-status-icon.h			\
+	gvc-stream-status-icon.c			\
+	gvc-applet.h					\
+	gvc-applet.c					\
+	applet-main.c					\
+	$(NULL)
+
+mate_volume_control_LDADD =				\
+	-lm						\
+	libmatevolumecontrol.la				\
+	$(VOLUME_CONTROL_LIBS)				\
+	$(NULL)
+
+mate_volume_control_SOURCES =				\
+	gvc-balance-bar.h				\
+	gvc-balance-bar.c				\
+	gvc-level-bar.h					\
+	gvc-level-bar.c					\
+	gvc-combo-box.h					\
+	gvc-combo-box.c					\
+	gvc-sound-theme-chooser.c 			\
+	gvc-sound-theme-chooser.h 			\
+	gvc-speaker-test.h				\
+	gvc-speaker-test.c				\
+	sound-theme-file-utils.c			\
+	sound-theme-file-utils.h			\
+	gvc-mixer-dialog.c				\
+	gvc-mixer-dialog.h				\
+	dialog-main.c					\
+	$(NULL)
+
+BUILT_SOURCES =						\
+	$(NULL)
+
+CLEANFILES =						\
+	$(BUILT_SOURCES)				\
+	$(NULL)
+
+MAINTAINERCLEANFILES =					\
+	*~						\
+	Makefile.in
+
 -include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/src/applet-main.c b/mate-volume-control/applet-main.c
index 1b4bb0a..1b4bb0a 100644
--- a/mate-volume-control/src/applet-main.c
+++ b/mate-volume-control/applet-main.c
diff --git a/mate-volume-control/src/dialog-main.c b/mate-volume-control/dialog-main.c
index c111c26..08c55fc 100644
--- a/mate-volume-control/src/dialog-main.c
+++ b/mate-volume-control/dialog-main.c
@@ -34,6 +34,7 @@
 #define DIALOG_POPUP_TIMEOUT 3
 
 static guint       popup_id = 0;
+static gboolean    debug = FALSE;
 static gboolean    show_version = FALSE;
 
 static gchar      *page = NULL;
@@ -181,6 +182,7 @@ main (int argc, char **argv)
         UniqueApp        *app;
         GOptionEntry      entries[] = {
                 { "backend", 'b', 0, G_OPTION_ARG_STRING, &backend, N_("Sound system backend"), "pulse|alsa|oss|null" },
+                { "debug",   'd', 0, G_OPTION_ARG_NONE,   &debug, N_("Enable debug"), NULL },
                 { "page",    'p', 0, G_OPTION_ARG_STRING, &page, N_("Startup page"), "effects|hardware|input|output|applications" },
                 { "version", 'v', 0, G_OPTION_ARG_NONE,   &show_version, N_("Version of this application"), NULL },
                 { NULL }
@@ -203,6 +205,9 @@ main (int argc, char **argv)
                 g_print ("%s %s\n", argv[0], VERSION);
                 return 0;
         }
+        if (debug == TRUE) {
+                g_setenv ("G_MESSAGES_DEBUG", "all", FALSE);
+        }
 
         app = unique_app_new (GVC_DIALOG_DBUS_NAME, NULL);
 
diff --git a/mate-volume-control/src/gvc-applet.c b/mate-volume-control/gvc-applet.c
index 3cb691f..3cb691f 100644
--- a/mate-volume-control/src/gvc-applet.c
+++ b/mate-volume-control/gvc-applet.c
diff --git a/mate-volume-control/src/gvc-applet.h b/mate-volume-control/gvc-applet.h
index 991ef6d..991ef6d 100644
--- a/mate-volume-control/src/gvc-applet.h
+++ b/mate-volume-control/gvc-applet.h
diff --git a/mate-volume-control/src/gvc-balance-bar.c b/mate-volume-control/gvc-balance-bar.c
index 7431773..7431773 100644
--- a/mate-volume-control/src/gvc-balance-bar.c
+++ b/mate-volume-control/gvc-balance-bar.c
diff --git a/mate-volume-control/src/gvc-balance-bar.h b/mate-volume-control/gvc-balance-bar.h
index d5b142d..d5b142d 100644
--- a/mate-volume-control/src/gvc-balance-bar.h
+++ b/mate-volume-control/gvc-balance-bar.h
diff --git a/mate-volume-control/src/gvc-channel-bar.c b/mate-volume-control/gvc-channel-bar.c
index e431651..e431651 100644
--- a/mate-volume-control/src/gvc-channel-bar.c
+++ b/mate-volume-control/gvc-channel-bar.c
diff --git a/mate-volume-control/src/gvc-channel-bar.h b/mate-volume-control/gvc-channel-bar.h
index 1c80be9..1c80be9 100644
--- a/mate-volume-control/src/gvc-channel-bar.h
+++ b/mate-volume-control/gvc-channel-bar.h
diff --git a/mate-volume-control/src/gvc-combo-box.c b/mate-volume-control/gvc-combo-box.c
index b2a273f..25c4639 100644
--- a/mate-volume-control/src/gvc-combo-box.c
+++ b/mate-volume-control/gvc-combo-box.c
@@ -32,16 +32,14 @@
 
 struct _GvcComboBoxPrivate
 {
-        GtkWidget     *drop_box;
-        GtkWidget     *start_box;
-        GtkWidget     *end_box;
-        GtkWidget     *label;
-        GtkWidget     *button;
-        GtkTreeModel  *model;
-        GtkWidget     *combobox;
-        gboolean       set_called;
-        GtkSizeGroup  *size_group;
-        gboolean       symmetric;
+        GtkWidget       *drop_box;
+        GtkWidget       *start_box;
+        GtkWidget       *end_box;
+        GtkWidget       *label;
+        GtkWidget       *button;
+        GtkTreeModel    *model;
+        GtkWidget       *combobox;
+        MateMixerSwitch *swtch;
 };
 
 enum {
@@ -51,7 +49,7 @@ enum {
 };
 
 enum {
-        CHANGED,
+        CHANGING,
         BUTTON_CLICKED,
         LAST_SIGNAL
 };
@@ -60,6 +58,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
 
 enum {
         PROP_0,
+        PROP_SWITCH,
         PROP_LABEL,
         PROP_SHOW_BUTTON,
         PROP_BUTTON_LABEL,
@@ -78,6 +77,14 @@ G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_BOX)
 G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_HBOX)
 #endif
 
+MateMixerSwitch *
+gvc_combo_box_get_switch (GvcComboBox *combobox)
+{
+        g_return_val_if_fail (GVC_IS_COMBO_BOX (combobox), NULL);
+
+        return combobox->priv->swtch;
+}
+
 void
 gvc_combo_box_set_size_group (GvcComboBox  *combobox,
                               GtkSizeGroup *group,
@@ -86,18 +93,89 @@ gvc_combo_box_set_size_group (GvcComboBox  *combobox,
         g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
         g_return_if_fail (GTK_IS_SIZE_GROUP (group));
 
-        combobox->priv->size_group = group;
-        combobox->priv->symmetric = symmetric;
+        if (group != NULL) {
+                gtk_size_group_add_widget (group, combobox->priv->start_box);
+                if (symmetric == TRUE)
+                        gtk_size_group_add_widget (group, combobox->priv->end_box);
+        }
+        gtk_widget_queue_draw (GTK_WIDGET (combobox));
+}
 
-        if (combobox->priv->size_group != NULL) {
-                gtk_size_group_add_widget (combobox->priv->size_group,
-                                           combobox->priv->start_box);
+static void
+on_switch_active_option_notify (MateMixerSwitch *swtch,
+                                GParamSpec      *pspec,
+                                GvcComboBox     *combobox)
+{
+        GtkTreeIter            iter;
+        MateMixerSwitchOption *active;
+        gboolean               cont;
+        const gchar           *name;
+
+        active = mate_mixer_switch_get_active_option (swtch);
+        if G_UNLIKELY (active == NULL) {
+                g_warn_if_reached ();
+                return;
+        }
+
+        /* Select the newly activated switch option in the combo box */
+        name = mate_mixer_switch_option_get_name (active);
+        cont = gtk_tree_model_get_iter_first (combobox->priv->model, &iter);
+        while (cont == TRUE) {
+                gchar *current;
 
-                if (combobox->priv->symmetric)
-                        gtk_size_group_add_widget (combobox->priv->size_group,
-                                                   combobox->priv->end_box);
+                gtk_tree_model_get (combobox->priv->model, &iter,
+                                    COL_NAME, &current,
+                                    -1);
+                if (g_strcmp0 (name, current) == 0) {
+                        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox->priv->combobox), &iter);
+                        g_free (current);
+                        return;
+                }
+                g_free (current);
+
+                cont = gtk_tree_model_iter_next (combobox->priv->model, &iter);
         }
-        gtk_widget_queue_draw (GTK_WIDGET (combobox));
+        g_warning ("Could not find switch option '%s' in combo box", name);
+}
+
+static void
+gvc_combo_box_set_switch (GvcComboBox *combobox, MateMixerSwitch *swtch)
+{
+        MateMixerSwitchOption *active;
+        const GList           *options;
+
+        g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
+        g_return_if_fail (MATE_MIXER_IS_SWITCH (swtch));
+
+        combobox->priv->swtch = g_object_ref (swtch);
+
+        active  = mate_mixer_switch_get_active_option (swtch);
+        options = mate_mixer_switch_list_options (swtch);
+        while (options != NULL) {
+                GtkTreeIter            iter;
+                MateMixerSwitchOption *option = MATE_MIXER_SWITCH_OPTION (options->data);
+
+                gtk_list_store_insert_with_values (GTK_LIST_STORE (combobox->priv->model),
+                                                   &iter,
+                                                   G_MAXINT,
+                                                   COL_NAME,
+                                                   mate_mixer_switch_option_get_name (option),
+                                                   COL_HUMAN_NAME,
+                                                   mate_mixer_switch_option_get_label (option),
+                                                   -1);
+
+                /* Select the currently active option of the switch */
+                if (option == active) {
+                        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox->priv->combobox),
+                                                       &iter);
+                }
+                options = options->next;
+        }
+
+        g_signal_connect (G_OBJECT (swtch),
+                          "notify::active-option",
+                          G_CALLBACK (on_switch_active_option_notify),
+                          combobox);
 }
 
 static void
@@ -109,6 +187,9 @@ gvc_combo_box_set_property (GObject       *object,
         GvcComboBox *self = GVC_COMBO_BOX (object);
 
         switch (prop_id) {
+        case PROP_SWITCH:
+                gvc_combo_box_set_switch (self, g_value_get_object (value));
+                break;
         case PROP_LABEL:
                 gtk_label_set_text_with_mnemonic (GTK_LABEL (self->priv->label), g_value_get_string (value));
                 break;
@@ -133,6 +214,9 @@ gvc_combo_box_get_property (GObject     *object,
         GvcComboBox *self = GVC_COMBO_BOX (object);
 
         switch (prop_id) {
+        case PROP_SWITCH:
+                g_value_set_object (value, self->priv->swtch);
+                break;
         case PROP_LABEL:
                 g_value_set_string (value, gtk_label_get_text (GTK_LABEL (self->priv->label)));
                 break;
@@ -157,37 +241,54 @@ gvc_combo_box_class_init (GvcComboBoxClass *klass)
         object_class->set_property = gvc_combo_box_set_property;
         object_class->get_property = gvc_combo_box_get_property;
 
+        properties[PROP_SWITCH] =
+                g_param_spec_object ("switch",
+                                     "switch",
+                                     "The MateMixerSwitch",
+                                     MATE_MIXER_TYPE_SWITCH,
+                                     G_PARAM_READWRITE |
+                                     G_PARAM_CONSTRUCT_ONLY |
+                                     G_PARAM_STATIC_STRINGS);
+
         properties[PROP_LABEL] =
                 g_param_spec_string ("label",
                                      "label",
                                      "The combo box label",
                                      _("_Profile:"),
-                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+                                     G_PARAM_READWRITE |
+                                     G_PARAM_CONSTRUCT |
+                                     G_PARAM_STATIC_STRINGS);
 
         properties[PROP_SHOW_BUTTON] =
                 g_param_spec_boolean ("show-button",
                                       "show-button",
                                       "Whether to show the button",
                                       FALSE,
-                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+                                      G_PARAM_READWRITE |
+                                      G_PARAM_CONSTRUCT |
+                                      G_PARAM_STATIC_STRINGS);
 
         properties[PROP_BUTTON_LABEL] =
                 g_param_spec_string ("button-label",
                                      "button-label",
                                      "The button's label",
                                      "",
-                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+                                     G_PARAM_READWRITE |
+                                     G_PARAM_CONSTRUCT |
+                                     G_PARAM_STATIC_STRINGS);
 
         g_object_class_install_properties (object_class, N_PROPERTIES, properties);
 
-        signals[CHANGED] =
-                g_signal_new ("changed",
+        signals[CHANGING] =
+                g_signal_new ("changing",
                               G_TYPE_FROM_CLASS (klass),
                               G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GvcComboBoxClass, changed),
+                              G_STRUCT_OFFSET (GvcComboBoxClass, changing),
                               NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE, 1, G_TYPE_STRING);
+                              g_cclosure_marshal_VOID__VOID,
+                              G_TYPE_NONE,
+                              1,
+                              MATE_MIXER_TYPE_SWITCH_OPTION);
 
         signals[BUTTON_CLICKED] =
                 g_signal_new ("button-clicked",
@@ -196,84 +297,46 @@ gvc_combo_box_class_init (GvcComboBoxClass *klass)
                               G_STRUCT_OFFSET (GvcComboBoxClass, button_clicked),
                               NULL, NULL,
                               g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE, 0, G_TYPE_NONE);
+                              G_TYPE_NONE,
+                              0,
+                              G_TYPE_NONE);
 
         g_type_class_add_private (klass, sizeof (GvcComboBoxPrivate));
 }
 
-void
-gvc_combo_box_set_options (GvcComboBox *combobox, const GList *options)
-{
-        const GList *l;
-
-        g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
-        g_return_if_fail (combobox->priv->set_called == FALSE);
-
-        for (l = options; l != NULL; l = l->next) {
-                MateMixerSwitchOption *option = MATE_MIXER_SWITCH_OPTION (l->data);
-
-                gtk_list_store_insert_with_values (GTK_LIST_STORE (combobox->priv->model),
-                                                   NULL,
-                                                   G_MAXINT,
-                                                   COL_NAME,
-                                                   mate_mixer_switch_option_get_name (option),
-                                                   COL_HUMAN_NAME,
-                                                   mate_mixer_switch_option_get_label (option),
-                                                   -1);
-        }
-        combobox->priv->set_called = TRUE;
-}
-
-void
-gvc_combo_box_set_active (GvcComboBox *combobox, const gchar *id)
-{
-        GtkTreeIter iter;
-        gboolean    cont;
-
-        g_return_if_fail (GVC_IS_COMBO_BOX (combobox));
-        g_return_if_fail (id != NULL);
-
-        cont = gtk_tree_model_get_iter_first (combobox->priv->model, &iter);
-        while (cont != FALSE) {
-                gchar *name;
-
-                gtk_tree_model_get (combobox->priv->model, &iter,
-                                    COL_NAME, &name,
-                                    -1);
-                if (g_strcmp0 (name, id) == 0) {
-                        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox->priv->combobox), &iter);
-                        g_free (name);
-                        return;
-                }
-                g_free (name);
-
-                gtk_tree_model_iter_next (combobox->priv->model, &iter);
-        }
-        g_warning ("Could not find id '%s' in combo box", id);
-}
-
 static void
 on_combo_box_changed (GtkComboBox *widget, GvcComboBox *combobox)
 {
-        GtkTreeIter iter;
-        gchar      *profile;
+        GtkTreeIter            iter;
+        gchar                 *name;
+        MateMixerSwitchOption *option;
 
-        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter) == FALSE) {
-                g_warning ("Could not find an active profile or port");
+        if G_UNLIKELY (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter) == FALSE)
                 return;
-        }
 
         gtk_tree_model_get (combobox->priv->model, &iter,
-                            COL_NAME, &profile,
+                            COL_NAME, &name,
                             -1);
 
-        g_signal_emit (combobox, signals[CHANGED], 0, profile);
-        g_free (profile);
+        option = mate_mixer_switch_get_option (combobox->priv->swtch, name);
+        if G_UNLIKELY (option == NULL) {
+                g_warn_if_reached ();
+                g_free (name);
+                return;
+        }
+
+        /* Inform that we are about to change the active option of the switch */
+        g_signal_emit (combobox, signals[CHANGING], 0, option);
+
+        mate_mixer_switch_set_active_option (combobox->priv->swtch, option);
+        g_free (name);
 }
 
 static void
 on_combo_box_button_clicked (GtkButton *button, GvcComboBox *combobox)
 {
+        /* The meaning of the button is defined by the owner, so only notify
+         * when it is clicked on */
         g_signal_emit (combobox, signals[BUTTON_CLICKED], 0);
 }
 
@@ -283,30 +346,21 @@ gvc_combo_box_init (GvcComboBox *combobox)
         GtkWidget       *frame;
         GtkCellRenderer *renderer;
 
+        frame = gtk_frame_new (NULL);
+        gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+
         combobox->priv = GVC_COMBO_BOX_GET_PRIVATE (combobox);
 
         combobox->priv->model = GTK_TREE_MODEL (gtk_list_store_new (NUM_COLS,
                                                                     G_TYPE_STRING,
                                                                     G_TYPE_STRING));
-        combobox->priv->label = gtk_label_new (NULL);
-
-        gtk_misc_set_alignment (GTK_MISC (combobox->priv->label), 0.0, 0.5);
 
-        /* Frame */
-        frame = gtk_frame_new (NULL);
-        gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-        gtk_box_pack_start (GTK_BOX (combobox), frame, TRUE, TRUE, 0);
+        combobox->priv->combobox = gtk_combo_box_new_with_model (combobox->priv->model);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-        combobox->priv->drop_box  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-        combobox->priv->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-        combobox->priv->end_box   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
-        combobox->priv->drop_box  = gtk_hbox_new (FALSE, 6);
-        combobox->priv->start_box = gtk_hbox_new (FALSE, 6);
-        combobox->priv->end_box   = gtk_hbox_new (FALSE, 6);
-#endif
-        combobox->priv->combobox  = gtk_combo_box_new_with_model (combobox->priv->model);
+        combobox->priv->label = gtk_label_new (NULL);
+        gtk_misc_set_alignment (GTK_MISC (combobox->priv->label), 0.0, 0.5);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (combobox->priv->label),
+                                       combobox->priv->combobox);
 
         renderer = gtk_cell_renderer_text_new ();
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox->priv->combobox),
@@ -318,6 +372,10 @@ gvc_combo_box_init (GvcComboBox *combobox)
                                        COL_HUMAN_NAME);
 
 #if GTK_CHECK_VERSION (3, 0, 0)
+        combobox->priv->drop_box  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+        combobox->priv->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+        combobox->priv->end_box   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+
         /* Make sure the combo box does not get too long on long profile names */
         g_object_set (G_OBJECT (renderer),
                       "ellipsize",
@@ -325,8 +383,16 @@ gvc_combo_box_init (GvcComboBox *combobox)
                       NULL);
 
         gtk_combo_box_set_popup_fixed_width (GTK_COMBO_BOX (combobox->priv->combobox), FALSE);
+#else
+        combobox->priv->drop_box  = gtk_hbox_new (FALSE, 6);
+        combobox->priv->start_box = gtk_hbox_new (FALSE, 6);
+        combobox->priv->end_box   = gtk_hbox_new (FALSE, 6);
 #endif
 
+        gtk_box_pack_start (GTK_BOX (combobox),
+                            frame,
+                            TRUE, TRUE, 0);
+
         gtk_box_pack_start (GTK_BOX (combobox->priv->drop_box),
                             combobox->priv->start_box,
                             FALSE, FALSE, 0);
@@ -346,22 +412,7 @@ gvc_combo_box_init (GvcComboBox *combobox)
                             combobox->priv->end_box,
                             FALSE, FALSE, 0);
 
-        gtk_widget_set_no_show_all (combobox->priv->button, TRUE);
-
-        if (combobox->priv->size_group != NULL) {
-                gtk_size_group_add_widget (combobox->priv->size_group,
-                                           combobox->priv->start_box);
-
-                if (combobox->priv->symmetric)
-                        gtk_size_group_add_widget (combobox->priv->size_group,
-                                                   combobox->priv->end_box);
-        }
-
-        gtk_label_set_mnemonic_widget (GTK_LABEL (combobox->priv->label),
-                                       combobox->priv->combobox);
-
         gtk_container_add (GTK_CONTAINER (frame), combobox->priv->drop_box);
-        gtk_widget_show_all (frame);
 
         g_signal_connect (G_OBJECT (combobox->priv->combobox),
                           "changed",
@@ -371,6 +422,9 @@ gvc_combo_box_init (GvcComboBox *combobox)
                           "clicked",
                           G_CALLBACK (on_combo_box_button_clicked),
                           combobox);
+
+        gtk_widget_set_no_show_all (combobox->priv->button, TRUE);
+        gtk_widget_show_all (frame);
 }
 
 static void
@@ -380,15 +434,23 @@ gvc_combo_box_dispose (GObject *object)
 
         combobox = GVC_COMBO_BOX (object);
 
+        if G_LIKELY (combobox->priv->swtch != NULL) {
+                g_signal_handlers_disconnect_by_func (G_OBJECT (combobox->priv->swtch),
+                                                      G_CALLBACK (on_switch_active_option_notify),
+                                                      combobox);
+                g_clear_object (&combobox->priv->swtch);
+        }
+
         g_clear_object (&combobox->priv->model);
 
         G_OBJECT_CLASS (gvc_combo_box_parent_class)->dispose (object);
 }
 
 GtkWidget *
-gvc_combo_box_new (const gchar *label)
+gvc_combo_box_new (MateMixerSwitch *swtch, const gchar *label)
 {
         return g_object_new (GVC_TYPE_COMBO_BOX,
+                             "switch", swtch,
                              "label", label,
 #if GTK_CHECK_VERSION (3, 0, 0)
                              "orientation", GTK_ORIENTATION_HORIZONTAL,
diff --git a/mate-volume-control/src/gvc-combo-box.h b/mate-volume-control/gvc-combo-box.h
index 9a2f425..0767704 100644
--- a/mate-volume-control/src/gvc-combo-box.h
+++ b/mate-volume-control/gvc-combo-box.h
@@ -26,6 +26,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
+#include <libmatemixer/matemixer.h>
+
 G_BEGIN_DECLS
 
 #define GVC_TYPE_COMBO_BOX         (gvc_combo_box_get_type ())
@@ -56,23 +58,21 @@ struct _GvcComboBoxClass
 #else
         GtkHBoxClass            parent_class;
 #endif
-        void (* changed)        (GvcComboBox *combobox,
-                                 const gchar *name);
-        void (* button_clicked) (GvcComboBox *combobox);
+        void (* changing)       (GvcComboBox           *combobox,
+                                 MateMixerSwitchOption *option);
+        void (* button_clicked) (GvcComboBox           *combobox);
 };
 
 GType               gvc_combo_box_get_type            (void) G_GNUC_CONST;
 
-GtkWidget *         gvc_combo_box_new                 (const gchar  *label);
+GtkWidget *         gvc_combo_box_new                 (MateMixerSwitch *swtch,
+                                                       const gchar     *label);
 
-void                gvc_combo_box_set_size_group      (GvcComboBox  *combobox,
-                                                       GtkSizeGroup *group,
-                                                       gboolean      symmetric);
+MateMixerSwitch *   gvc_combo_box_get_switch          (GvcComboBox     *combobox);
 
-void                gvc_combo_box_set_options         (GvcComboBox  *combobox,
-                                                       const GList  *options);
-void                gvc_combo_box_set_active          (GvcComboBox  *combobox,
-                                                       const gchar  *id);
+void                gvc_combo_box_set_size_group      (GvcComboBox     *combobox,
+                                                       GtkSizeGroup    *group,
+                                                       gboolean         symmetric);
 
 G_END_DECLS
 
diff --git a/mate-volume-control/src/gvc-level-bar.c b/mate-volume-control/gvc-level-bar.c
index 0f3dc1b..9a67c1d 100644
--- a/mate-volume-control/src/gvc-level-bar.c
+++ b/mate-volume-control/gvc-level-bar.c
@@ -19,16 +19,17 @@
  *
  */
 
-// XXX on gtk3 the last two squares don't get filled
-
 #include <math.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-desktop-utils.h>
+
 #include "gvc-level-bar.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
 
 #define GVC_LEVEL_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_LEVEL_BAR, GvcLevelBarPrivate))
 
@@ -181,13 +182,10 @@ bar_calc_layout (GvcLevelBar *bar)
         gtk_style_context_get_background_color (context,
                                                 GTK_STATE_FLAG_SELECTED,
                                                 &bar->priv->layout.color_fg);
-        gtk_style_context_get_color (context,
-                                     GTK_STATE_FLAG_NORMAL,
-                                     &bar->priv->layout.color_dark);
 
-        mvc_color_shade (&bar->priv->layout.color_dark,
-                         &bar->priv->layout.color_dark,
-                         0.7);
+        mate_desktop_gtk_style_get_dark_color (context,
+                                               GTK_STATE_FLAG_NORMAL,
+                                               &bar->priv->layout.color_dark);
 #else
         GtkStyle *style;
 
@@ -825,6 +823,12 @@ gvc_level_bar_class_init (GvcLevelBarClass *klass)
 static void
 gvc_level_bar_init (GvcLevelBar *bar)
 {
+#if GTK_CHECK_VERSION (3, 0, 0)
+        GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (bar));
+
+        gtk_style_context_add_class (context, GTK_STYLE_CLASS_LIST_ROW);
+#endif
+
         bar->priv = GVC_LEVEL_BAR_GET_PRIVATE (bar);
 
         bar->priv->peak_adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,
diff --git a/mate-volume-control/src/gvc-level-bar.h b/mate-volume-control/gvc-level-bar.h
index ef9ae7e..ef9ae7e 100644
--- a/mate-volume-control/src/gvc-level-bar.h
+++ b/mate-volume-control/gvc-level-bar.h
diff --git a/mate-volume-control/src/gvc-mixer-dialog.c b/mate-volume-control/gvc-mixer-dialog.c
index 26e0540..92a72a7 100644
--- a/mate-volume-control/src/gvc-mixer-dialog.c
+++ b/mate-volume-control/gvc-mixer-dialog.c
@@ -36,7 +36,7 @@
 #include "gvc-sound-theme-chooser.h"
 #include "gvc-level-bar.h"
 #include "gvc-speaker-test.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
 
 #define GVC_MIXER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_DIALOG, GvcMixerDialogPrivate))
 
@@ -143,13 +143,11 @@ find_stream_port_switch (MateMixerStream *stream)
 
         switches = mate_mixer_stream_list_switches (stream);
         while (switches != NULL) {
-                MateMixerSwitch     *swtch = MATE_MIXER_SWITCH (switches->data);
-                MateMixerSwitchFlags flags;
+                MateMixerStreamSwitch *swtch = MATE_MIXER_STREAM_SWITCH (switches->data);
 
-                flags = mate_mixer_switch_get_flags (swtch);
-                if ((flags & MATE_MIXER_SWITCH_TOGGLE) == 0 &&
-                    mate_mixer_switch_get_role (swtch) == MATE_MIXER_SWITCH_ROLE_PORT)
-                    return swtch;
+                if (!MATE_MIXER_IS_TOGGLE (swtch) &&
+                    mate_mixer_stream_switch_get_role (swtch) == MATE_MIXER_STREAM_SWITCH_ROLE_PORT)
+                    return MATE_MIXER_SWITCH (swtch);
 
                 switches = switches->next;
         }
@@ -163,10 +161,10 @@ find_device_profile_switch (MateMixerDevice *device)
 
         switches = mate_mixer_device_list_switches (device);
         while (switches != NULL) {
-                MateMixerSwitch *swtch = MATE_MIXER_SWITCH (switches->data);
+                MateMixerDeviceSwitch *swtch = MATE_MIXER_DEVICE_SWITCH (switches->data);
 
-                if (mate_mixer_switch_get_role (swtch) == MATE_MIXER_SWITCH_ROLE_DEVICE_PROFILE)
-                        return swtch;
+                if (mate_mixer_device_switch_get_role (swtch) == MATE_MIXER_DEVICE_SWITCH_ROLE_PROFILE)
+                        return MATE_MIXER_SWITCH (swtch);
 
                 switches = switches->next;
         }
@@ -253,70 +251,6 @@ update_default_tree_item (GvcMixerDialog  *dialog,
 }
 
 static void
-on_combobox_option_changed (GvcComboBox    *combo,
-                            const gchar    *name,
-                            GvcMixerDialog *dialog)
-{
-        MateMixerSwitch       *swtch;
-        MateMixerSwitchOption *option;
-        const GList           *options;
-
-        swtch = g_object_get_data (G_OBJECT (combo), "switch");
-        if (G_UNLIKELY (swtch == NULL)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        options = mate_mixer_switch_list_options (swtch);
-        while (options != NULL) {
-                option = MATE_MIXER_SWITCH_OPTION (options->data);
-
-                if (g_strcmp0 (mate_mixer_switch_option_get_name (option), name) == 0)
-                        break;
-
-                option  = NULL;
-                options = options->next;
-        }
-
-        if (G_UNLIKELY (option == NULL)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        mate_mixer_switch_set_active_option (swtch, option);
-}
-
-static GtkWidget *
-create_port_combo_box (GvcMixerDialog  *dialog,
-                       MateMixerSwitch *swtch,
-                       const gchar     *name,
-                       const GList     *items,
-                       const gchar     *active)
-{
-        GtkWidget *combobox;
-
-        combobox = gvc_combo_box_new (name);
-
-        gvc_combo_box_set_options (GVC_COMBO_BOX (combobox), items);
-        gvc_combo_box_set_active (GVC_COMBO_BOX (combobox), active);
-
-        gvc_combo_box_set_size_group (GVC_COMBO_BOX (combobox),
-                                      dialog->priv->size_group,
-                                      FALSE);
-
-        g_object_set_data_full (G_OBJECT (combobox),
-                                "switch",
-                                g_object_ref (swtch),
-                                g_object_unref);
-
-        g_signal_connect (G_OBJECT (combobox),
-                          "changed",
-                          G_CALLBACK (on_combobox_option_changed),
-                          dialog);
-        return combobox;
-}
-
-static void
 update_output_settings (GvcMixerDialog *dialog)
 {
         MateMixerStream            *stream;
@@ -420,21 +354,12 @@ update_output_settings (GvcMixerDialog *dialog)
         /* Enable the port selector if the stream has one */
         port_switch = find_stream_port_switch (stream);
         if (port_switch != NULL) {
-                const GList           *options;
-                const gchar           *active_name = NULL;
-                MateMixerSwitchOption *active;
-
-                options = mate_mixer_switch_list_options (port_switch);
-                active  = mate_mixer_switch_get_active_option (port_switch);
-                if (active != NULL)
-                    active_name = mate_mixer_switch_option_get_name (active);
-
                 dialog->priv->output_port_combo =
-                        create_port_combo_box (dialog,
-                                               port_switch,
-                                               _("Co_nnector:"),
-                                               options,
-                                               active_name);
+                        gvc_combo_box_new (port_switch, _("Co_nnector:"));
+
+                gvc_combo_box_set_size_group (GVC_COMBO_BOX (dialog->priv->output_port_combo),
+                                              dialog->priv->size_group,
+                                              FALSE);
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
                                     dialog->priv->output_port_combo,
@@ -578,21 +503,12 @@ update_input_settings (GvcMixerDialog *dialog)
         /* Enable the port selector if the stream has one */
         port_switch = find_stream_port_switch (stream);
         if (port_switch != NULL) {
-                const GList           *options;
-                const gchar           *active_name = NULL;
-                MateMixerSwitchOption *active;
-
-                options = mate_mixer_switch_list_options (port_switch);
-                active  = mate_mixer_switch_get_active_option (port_switch);
-                if (active != NULL)
-                    active_name = mate_mixer_switch_option_get_name (active);
-
                 dialog->priv->input_port_combo =
-                        create_port_combo_box (dialog,
-                                               port_switch,
-                                               _("Co_nnector:"),
-                                               options,
-                                               active_name);
+                        gvc_combo_box_new (port_switch, _("Co_nnector:"));
+
+                gvc_combo_box_set_size_group (GVC_COMBO_BOX (dialog->priv->input_port_combo),
+                                              dialog->priv->size_group,
+                                              FALSE);
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->input_settings_box),
                                     dialog->priv->input_port_combo,
@@ -702,55 +618,6 @@ on_context_default_input_stream_notify (MateMixerContext *context,
         set_input_stream (dialog, stream);
 }
 
-static GvcComboBox *
-find_combo_box_by_switch (GvcMixerDialog *dialog, MateMixerSwitch *swtch)
-{
-        MateMixerSwitch *combo_switch;
-
-        if (dialog->priv->output_port_combo != NULL) {
-                combo_switch = g_object_get_data (G_OBJECT (dialog->priv->output_port_combo),
-                                                  "switch");
-                if (combo_switch == swtch)
-                        return GVC_COMBO_BOX (dialog->priv->output_port_combo);
-        }
-
-        if (dialog->priv->input_port_combo != NULL) {
-                combo_switch = g_object_get_data (G_OBJECT (dialog->priv->input_port_combo),
-                                                  "switch");
-                if (combo_switch == swtch)
-                        return GVC_COMBO_BOX (dialog->priv->input_port_combo);
-        }
-        return NULL;
-}
-
-static void
-on_switch_option_notify (MateMixerSwitch *swtch,
-                         GParamSpec      *pspec,
-                         GvcMixerDialog  *dialog)
-{
-        GvcComboBox           *combobox;
-        MateMixerSwitchOption *port;
-
-        combobox = find_combo_box_by_switch (dialog, swtch);
-        if (G_UNLIKELY (combobox == NULL)) {
-                g_warn_if_reached ();
-                return;
-        }
-
-        g_signal_handlers_block_by_func (G_OBJECT (combobox),
-                                         on_combobox_option_changed,
-                                         dialog);
-
-        port = mate_mixer_switch_get_active_option (swtch);
-        if (G_LIKELY (port != NULL))
-                gvc_combo_box_set_active (GVC_COMBO_BOX (combobox),
-                                          mate_mixer_switch_option_get_name (port));
-
-        g_signal_handlers_unblock_by_func (G_OBJECT (combobox),
-                                           on_combobox_option_changed,
-                                           dialog);
-}
-
 static GtkWidget *
 create_bar (GvcMixerDialog *dialog, gboolean use_size_group, gboolean symmetric)
 {
@@ -779,19 +646,9 @@ bar_set_stream (GvcMixerDialog  *dialog,
 {
         MateMixerStreamControl *control = NULL;
 
-        if (stream != NULL) {
-                MateMixerSwitch *port_switch;
-
+        if (stream != NULL)
                 control = mate_mixer_stream_get_default_control (stream);
 
-                port_switch = find_stream_port_switch (stream);
-                if (port_switch != NULL)
-                        g_signal_connect (G_OBJECT (port_switch),
-                                          "notify::active-option",
-                                          G_CALLBACK (on_switch_option_notify),
-                                          dialog);
-        }
-
         bar_set_stream_control (dialog, bar, control);
 }
 
@@ -1037,7 +894,7 @@ add_stream (GvcMixerDialog *dialog, MateMixerStream *stream)
 
                 control = mate_mixer_stream_get_default_control (stream);
                 if (G_LIKELY (control != NULL))
-                        speakers = mvc_channel_map_to_pretty_string (control);
+                        speakers = gvc_channel_map_to_pretty_string (control);
         }
 
         controls = mate_mixer_stream_list_controls (stream);
@@ -1367,30 +1224,15 @@ update_device_info (GvcMixerDialog *dialog, MateMixerDevice *device)
 }
 
 static void
-on_device_profile_notify (MateMixerSwitch *swtch,
-                          GParamSpec      *pspec,
-                          GvcMixerDialog  *dialog)
+on_device_profile_active_option_notify (MateMixerDeviceSwitch *swtch,
+                                        GParamSpec            *pspec,
+                                        GvcMixerDialog        *dialog)
 {
-        MateMixerSwitchOption *active;
-
-        g_signal_handlers_block_by_func (G_OBJECT (dialog->priv->hw_profile_combo),
-                                         G_CALLBACK (on_combobox_option_changed),
-                                         dialog);
-
-        active = mate_mixer_switch_get_active_option (swtch);
-        if (G_LIKELY (active != NULL)) {
-                const gchar *name = mate_mixer_switch_option_get_name (active);
-
-                gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->hw_profile_combo),
-                                          name);
-        }
+        MateMixerDevice *device;
 
-        g_signal_handlers_unblock_by_func (G_OBJECT (dialog->priv->hw_profile_combo),
-                                           G_CALLBACK (on_combobox_option_changed),
-                                           dialog);
+        device = mate_mixer_device_switch_get_device (swtch);
 
-        // XXX find device
-        // update_device_info (dialog, device);
+        update_device_info (dialog, device);
 }
 
 static void
@@ -1426,9 +1268,9 @@ add_device (GvcMixerDialog *dialog, MateMixerDevice *device)
                 if (G_LIKELY (active != NULL))
                         profile_label = mate_mixer_switch_option_get_label (active);
 
-                g_signal_connect (G_OBJECT (device),
+                g_signal_connect (G_OBJECT (profile_switch),
                                   "notify::active-option",
-                                  G_CALLBACK (on_device_profile_notify),
+                                  G_CALLBACK (on_device_profile_active_option_notify),
                                   dialog);
         }
 
@@ -1705,6 +1547,15 @@ create_stream_treeview (GvcMixerDialog *dialog, GCallback on_toggled)
 }
 
 static void
+on_device_profile_changing (GvcComboBox           *combobox,
+                            MateMixerSwitchOption *option,
+                            GvcMixerDialog        *dialog)
+{
+        g_debug ("Changing device profile");
+        // TODO
+}
+
+static void
 on_test_speakers_clicked (GvcComboBox *widget, GvcMixerDialog *dialog)
 {
         GtkWidget       *d,
@@ -1750,46 +1601,6 @@ on_test_speakers_clicked (GvcComboBox *widget, GvcMixerDialog *dialog)
         gtk_widget_destroy (d);
 }
 
-static GtkWidget *
-create_profile_combo_box (GvcMixerDialog  *dialog,
-                          MateMixerSwitch *swtch,
-                          const gchar     *name,
-                          const GList     *items,
-                          const gchar     *active)
-{
-        GtkWidget *combobox;
-
-        combobox = gvc_combo_box_new (name);
-
-        gvc_combo_box_set_options (GVC_COMBO_BOX (combobox), items);
-        gvc_combo_box_set_active (GVC_COMBO_BOX (combobox), active);
-
-        gvc_combo_box_set_size_group (GVC_COMBO_BOX (combobox),
-                                      dialog->priv->size_group,
-                                      FALSE);
-
-        g_object_set (G_OBJECT (combobox),
-                      "button-label", _("Test Speakers"),
-                      NULL);
-
-        g_object_set_data_full (G_OBJECT (combobox),
-                                "switch",
-                                g_object_ref (swtch),
-                                g_object_unref);
-
-        g_signal_connect (G_OBJECT (combobox),
-                          "changed",
-                          G_CALLBACK (on_combobox_option_changed),
-                          dialog);
-
-        g_signal_connect (G_OBJECT (combobox),
-                          "button-clicked",
-                          G_CALLBACK (on_test_speakers_clicked),
-                          dialog);
-
-        return combobox;
-}
-
 static void
 on_device_selection_changed (GtkTreeSelection *selection, GvcMixerDialog *dialog)
 {
@@ -1826,26 +1637,27 @@ on_device_selection_changed (GtkTreeSelection *selection, GvcMixerDialog *dialog
         /* Profile/speaker test combo */
         profile_switch = find_device_profile_switch (device);
         if (profile_switch != NULL) {
-                const GList           *options;
-                const gchar           *active_name = NULL;
-                MateMixerSwitchOption *active;
+                dialog->priv->hw_profile_combo =
+                        gvc_combo_box_new (profile_switch, _("_Profile:"));
 
-                options = mate_mixer_switch_list_options (profile_switch);
-                active  = mate_mixer_switch_get_active_option (profile_switch);
-                if (active != NULL)
-                    active_name = mate_mixer_switch_option_get_name (active);
+                g_object_set (G_OBJECT (dialog->priv->hw_profile_combo),
+                              "button-label", _("Test Speakers"),
+                              NULL);
 
-                dialog->priv->hw_profile_combo =
-                        create_profile_combo_box (dialog,
-                                                  profile_switch,
-                                                  _("_Profile:"),
-                                                  options,
-                                                  active_name);
+                g_signal_connect (G_OBJECT (dialog->priv->hw_profile_combo),
+                                  "changing",
+                                  G_CALLBACK (on_device_profile_changing),
+                                  dialog);
+
+                g_signal_connect (G_OBJECT (dialog->priv->hw_profile_combo),
+                                  "button-clicked",
+                                  G_CALLBACK (on_test_speakers_clicked),
+                                  dialog);
 
                 g_object_set_data_full (G_OBJECT (dialog->priv->hw_profile_combo),
-                                   "device",
-                                   g_object_ref (device),
-                                   g_object_unref);
+                                        "device",
+                                        g_object_ref (device),
+                                        g_object_unref);
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->hw_settings_box),
                                     dialog->priv->hw_profile_combo,
diff --git a/mate-volume-control/src/gvc-mixer-dialog.h b/mate-volume-control/gvc-mixer-dialog.h
index 22e522d..22e522d 100644
--- a/mate-volume-control/src/gvc-mixer-dialog.h
+++ b/mate-volume-control/gvc-mixer-dialog.h
diff --git a/sound-theme/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c
index 4d7337c..4d7337c 100644
--- a/sound-theme/gvc-sound-theme-chooser.c
+++ b/mate-volume-control/gvc-sound-theme-chooser.c
diff --git a/sound-theme/gvc-sound-theme-chooser.h b/mate-volume-control/gvc-sound-theme-chooser.h
index c7bfac0..c7bfac0 100644
--- a/sound-theme/gvc-sound-theme-chooser.h
+++ b/mate-volume-control/gvc-sound-theme-chooser.h
diff --git a/mate-volume-control/src/gvc-speaker-test.c b/mate-volume-control/gvc-speaker-test.c
index 0f6c9e7..e638413 100644
--- a/mate-volume-control/src/gvc-speaker-test.c
+++ b/mate-volume-control/gvc-speaker-test.c
@@ -30,7 +30,7 @@
 #include <libmatemixer/matemixer.h>
 
 #include "gvc-speaker-test.h"
-#include "mvc-helpers.h"
+#include "gvc-utils.h"
 
 #define GVC_SPEAKER_TEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_SPEAKER_TEST, GvcSpeakerTestPrivate))
 
@@ -316,10 +316,10 @@ on_test_button_clicked (GtkButton *button, GtkWidget *control)
                                   CA_PROP_MEDIA_ROLE, "test");
                 ca_proplist_sets (proplist,
                                   CA_PROP_MEDIA_NAME,
-                                  mvc_channel_position_to_pretty_string (position));
+                                  gvc_channel_position_to_pretty_string (position));
                 ca_proplist_sets (proplist,
                                   CA_PROP_CANBERRA_FORCE_CHANNEL,
-                                  mvc_channel_position_to_string (position));
+                                  gvc_channel_position_to_pulse_string (position));
 
                 ca_proplist_sets (proplist, CA_PROP_CANBERRA_ENABLE, "1");
 
@@ -374,7 +374,7 @@ create_control (ca_context *canberra, MateMixerChannelPosition position)
         g_object_set_data (G_OBJECT (control), "image", image);
         gtk_box_pack_start (GTK_BOX (control), image, FALSE, FALSE, 0);
 
-        label = gtk_label_new (mvc_channel_position_to_pretty_string (position));
+        label = gtk_label_new (gvc_channel_position_to_pretty_string (position));
         gtk_box_pack_start (GTK_BOX (control), label, FALSE, FALSE, 0);
 
         test_button = gtk_button_new_with_label (_("Test"));
diff --git a/mate-volume-control/src/gvc-speaker-test.h b/mate-volume-control/gvc-speaker-test.h
index 1c1546d..1c1546d 100644
--- a/mate-volume-control/src/gvc-speaker-test.h
+++ b/mate-volume-control/gvc-speaker-test.h
diff --git a/mate-volume-control/src/gvc-stream-status-icon.c b/mate-volume-control/gvc-stream-status-icon.c
index 3ede4b1..3ede4b1 100644
--- a/mate-volume-control/src/gvc-stream-status-icon.c
+++ b/mate-volume-control/gvc-stream-status-icon.c
diff --git a/mate-volume-control/src/gvc-stream-status-icon.h b/mate-volume-control/gvc-stream-status-icon.h
index 7b51801..7b51801 100644
--- a/mate-volume-control/src/gvc-stream-status-icon.h
+++ b/mate-volume-control/gvc-stream-status-icon.h
diff --git a/mate-volume-control/gvc-utils.c b/mate-volume-control/gvc-utils.c
new file mode 100644
index 0000000..21a583f
--- /dev/null
+++ b/mate-volume-control/gvc-utils.c
@@ -0,0 +1,158 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2014 Michal Ratajsky <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <libmatemixer/matemixer.h>
+
+#include "gvc-utils.h"
+
+/* libcanberra requires a PulseAudio channel name to be given to its
+ * CA_PROP_CANBERRA_FORCE_CHANNEL property.
+ *
+ * The strings here are copied from PulseAudio source code to avoid depending
+ * on libpulse. */
+static const gchar *pulse_position[MATE_MIXER_CHANNEL_MAX] = {
+        [MATE_MIXER_CHANNEL_MONO] = "mono",
+        [MATE_MIXER_CHANNEL_FRONT_LEFT] = "front-left",
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT] = "front-right",
+        [MATE_MIXER_CHANNEL_FRONT_CENTER] = "front-center",
+        [MATE_MIXER_CHANNEL_LFE] = "lfe",
+        [MATE_MIXER_CHANNEL_BACK_LEFT] = "rear-left",
+        [MATE_MIXER_CHANNEL_BACK_RIGHT] = "rear-right",
+        [MATE_MIXER_CHANNEL_BACK_CENTER] = "rear-center",
+        [MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER] = "front-left-of-center",
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER] = "front-right-of-center",
+        [MATE_MIXER_CHANNEL_SIDE_LEFT] = "side-left",
+        [MATE_MIXER_CHANNEL_SIDE_RIGHT] = "side-right",
+        [MATE_MIXER_CHANNEL_TOP_FRONT_LEFT] = "top-front-left",
+        [MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT] = "top-front-right",
+        [MATE_MIXER_CHANNEL_TOP_FRONT_CENTER] = "top-front-center",
+        [MATE_MIXER_CHANNEL_TOP_CENTER] = "top-center",
+        [MATE_MIXER_CHANNEL_TOP_BACK_LEFT] = "top-rear-left",
+        [MATE_MIXER_CHANNEL_TOP_BACK_RIGHT] = "top-rear-right",
+        [MATE_MIXER_CHANNEL_TOP_BACK_CENTER] = "top-rear-center"
+};
+
+static const gchar *pretty_position[MATE_MIXER_CHANNEL_MAX] = {
+        [MATE_MIXER_CHANNEL_UNKNOWN] = N_("Unknown"),
+        /* Speaker channel names */
+        [MATE_MIXER_CHANNEL_MONO] = N_("Mono"),
+        [MATE_MIXER_CHANNEL_FRONT_LEFT] = N_("Front Left"),
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT] = N_("Front Right"),
+        [MATE_MIXER_CHANNEL_FRONT_CENTER] = N_("Front Center"),
+        [MATE_MIXER_CHANNEL_LFE] = N_("LFE"),
+        [MATE_MIXER_CHANNEL_BACK_LEFT] = N_("Rear Left"),
+        [MATE_MIXER_CHANNEL_BACK_RIGHT] = N_("Rear Right"),
+        [MATE_MIXER_CHANNEL_BACK_CENTER] = N_("Rear Center"),
+        [MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER] = N_("Front Left of Center"),
+        [MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER] = N_("Front Right of Center"),
+        [MATE_MIXER_CHANNEL_SIDE_LEFT] = N_("Side Left"),
+        [MATE_MIXER_CHANNEL_SIDE_RIGHT] = N_("Side Right"),
+        [MATE_MIXER_CHANNEL_TOP_FRONT_LEFT] = N_("Top Front Left"),
+        [MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT] = N_("Top Front Right"),
+        [MATE_MIXER_CHANNEL_TOP_FRONT_CENTER] = N_("Top Front Center"),
+        [MATE_MIXER_CHANNEL_TOP_CENTER] = N_("Top Center"),
+        [MATE_MIXER_CHANNEL_TOP_BACK_LEFT] = N_("Top Rear Left"),
+        [MATE_MIXER_CHANNEL_TOP_BACK_RIGHT] = N_("Top Rear Right"),
+        [MATE_MIXER_CHANNEL_TOP_BACK_CENTER] = N_("Top Rear Center")
+};
+
+const gchar *
+gvc_channel_position_to_pulse_string (MateMixerChannelPosition position)
+{
+        g_return_val_if_fail (position >= 0 && position < MATE_MIXER_CHANNEL_MAX, NULL);
+
+        return pulse_position[position];
+}
+
+const gchar *
+gvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
+{
+        g_return_val_if_fail (position >= 0 && position < MATE_MIXER_CHANNEL_MAX, NULL);
+
+        return pretty_position[position];
+}
+
+const gchar *
+gvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
+{
+        g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), NULL);
+
+#define HAS_POSITION(p) (mate_mixer_stream_control_has_channel_position (control, (p)))
+
+        /* Modeled after PulseAudio 5.0, probably could be extended with other combinations */
+        switch (mate_mixer_stream_control_get_num_channels (control)) {
+        case 1:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_MONO))
+                        return _("Mono");
+                break;
+        case 2:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT))
+                        return _("Stereo");
+                break;
+        case 4:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
+                        return _("Surround 4.0");
+                break;
+        case 5:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
+                        if (HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
+                                return _("Surround 4.1");
+                        if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER))
+                                return _("Surround 5.0");
+                break;
+        case 6:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
+                        return _("Surround 5.1");
+                break;
+        case 8:
+                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_LEFT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_RIGHT) &&
+                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
+                        return _("Surround 7.1");
+                break;
+        }
+
+#undef HAS_POSITION
+
+        return NULL;
+}
diff --git a/mate-volume-control/src/mvc-helpers.h b/mate-volume-control/gvc-utils.h
index 050e66b..b39abb0 100644
--- a/mate-volume-control/src/mvc-helpers.h
+++ b/mate-volume-control/gvc-utils.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __MVC_HELPERS_H
-#define __MVC_HELPERS_H
+#ifndef __GVC_HELPERS_H
+#define __GVC_HELPERS_H
 
 #include <glib.h>
 
@@ -27,16 +27,10 @@
 
 G_BEGIN_DECLS
 
-const gchar *mvc_channel_position_to_string        (MateMixerChannelPosition position);
-const gchar *mvc_channel_position_to_pretty_string (MateMixerChannelPosition position);
-const gchar *mvc_channel_map_to_pretty_string      (MateMixerStreamControl  *control);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-void         mvc_color_shade                       (GdkRGBA                 *a,
-                                                    GdkRGBA                 *b,
-                                                    gdouble                  k);
-#endif
+const gchar *gvc_channel_position_to_pulse_string  (MateMixerChannelPosition position);
+const gchar *gvc_channel_position_to_pretty_string (MateMixerChannelPosition position);
+const gchar *gvc_channel_map_to_pretty_string      (MateMixerStreamControl  *control);
 
 G_END_DECLS
 
-#endif /* __MVC_HELPERS_H */
+#endif /* __GVC_HELPERS_H */
diff --git a/sound-theme/sound-theme-file-utils.c b/mate-volume-control/sound-theme-file-utils.c
index 1de9886..1de9886 100644
--- a/sound-theme/sound-theme-file-utils.c
+++ b/mate-volume-control/sound-theme-file-utils.c
diff --git a/sound-theme/sound-theme-file-utils.h b/mate-volume-control/sound-theme-file-utils.h
index 0ac248b..0ac248b 100644
--- a/sound-theme/sound-theme-file-utils.h
+++ b/mate-volume-control/sound-theme-file-utils.h
diff --git a/mate-volume-control/src/Makefile.am b/mate-volume-control/src/Makefile.am
deleted file mode 100644
index 50e3c15..0000000
--- a/mate-volume-control/src/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-NULL =
-
-bin_PROGRAMS = 					\
-	mate-volume-control-applet		\
-	mate-volume-control			\
-	$(NULL)
-
-AM_CPPFLAGS =					\
-	$(WARN_CFLAGS)				\
-	-I$(top_srcdir)/sound-theme		\
-	$(VOLUME_CONTROL_CFLAGS)		\
-	$(xxDISABLE_DEPRECATED)			\
-	$(PULSEAUDIO_CFLAGS)			\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
-	-DLIBEXECDIR=\"$(libexecdir)\"		\
-	-DGLADEDIR=\""$(pkgdatadir)"\"		\
-	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
-	$(NULL)
-
-noinst_LTLIBRARIES = libmatevolumecontrol.la
-libmatevolumecontrol_la_SOURCES =		\
-	gvc-channel-bar.h			\
-	gvc-channel-bar.c			\
-    mvc-helpers.c               \
-    mvc-helpers.h               \
-	$(NULL)
-
-mate_volume_control_applet_LDADD =		\
-	-lm					\
-	libmatevolumecontrol.la		\
-	$(VOLUME_CONTROL_LIBS)			\
-	$(PULSEAUDIO_LIBS)			\
-	$(NULL)
-
-mate_volume_control_applet_SOURCES =		\
-	gvc-stream-status-icon.h		\
-	gvc-stream-status-icon.c		\
-	gvc-applet.h				\
-	gvc-applet.c				\
-	applet-main.c				\
-	$(NULL)
-
-mate_volume_control_LDADD =				\
-	-lm						\
-	libmatevolumecontrol.la			\
-	$(top_builddir)/sound-theme/libsoundtheme.la	\
-	$(VOLUME_CONTROL_LIBS)				\
-	$(PULSEAUDIO_LIBS)				\
-	$(NULL)
-
-mate_volume_control_SOURCES =			\
-	gvc-balance-bar.h			\
-	gvc-balance-bar.c			\
-	gvc-level-bar.h				\
-	gvc-level-bar.c				\
-	gvc-combo-box.h				\
-	gvc-combo-box.c				\
-	gvc-speaker-test.h			\
-	gvc-speaker-test.c			\
-    gvc-mixer-dialog.h          \
-    gvc-mixer-dialog.c          \
-	dialog-main.c				\
-	$(NULL)
-
-BUILT_SOURCES =				\
-	$(NULL)
-
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
-
--include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/src/mvc-helpers.c b/mate-volume-control/src/mvc-helpers.c
deleted file mode 100644
index 7488743..0000000
--- a/mate-volume-control/src/mvc-helpers.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2014 Michal Ratajsky <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <libmatemixer/matemixer.h>
-
-#ifdef HAVE_PULSEAUDIO
-#include <pulse/pulseaudio.h>
-#endif
-
-#include "mvc-helpers.h"
-
-#ifdef HAVE_PULSEAUDIO
-static pa_channel_position_t
-position_to_pulse (MateMixerChannelPosition position)
-{
-        switch (position) {
-        case MATE_MIXER_CHANNEL_MONO:
-                return PA_CHANNEL_POSITION_MONO;
-        case MATE_MIXER_CHANNEL_FRONT_LEFT:
-                return PA_CHANNEL_POSITION_FRONT_LEFT;
-        case MATE_MIXER_CHANNEL_FRONT_RIGHT:
-                return PA_CHANNEL_POSITION_FRONT_RIGHT;
-        case MATE_MIXER_CHANNEL_FRONT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_CENTER;
-        case MATE_MIXER_CHANNEL_LFE:
-                return PA_CHANNEL_POSITION_LFE;
-        case MATE_MIXER_CHANNEL_BACK_LEFT:
-                return PA_CHANNEL_POSITION_REAR_LEFT;
-        case MATE_MIXER_CHANNEL_BACK_RIGHT:
-                return PA_CHANNEL_POSITION_REAR_RIGHT;
-        case MATE_MIXER_CHANNEL_BACK_CENTER:
-                return PA_CHANNEL_POSITION_REAR_CENTER;
-        case MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
-        case MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER:
-                return PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
-        case MATE_MIXER_CHANNEL_SIDE_LEFT:
-                return PA_CHANNEL_POSITION_SIDE_LEFT;
-        case MATE_MIXER_CHANNEL_SIDE_RIGHT:
-                return PA_CHANNEL_POSITION_SIDE_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_LEFT:
-                return PA_CHANNEL_POSITION_TOP_FRONT_LEFT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT:
-                return PA_CHANNEL_POSITION_TOP_FRONT_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_FRONT_CENTER:
-                return PA_CHANNEL_POSITION_TOP_FRONT_CENTER;
-        case MATE_MIXER_CHANNEL_TOP_CENTER:
-                return PA_CHANNEL_POSITION_TOP_CENTER;
-        case MATE_MIXER_CHANNEL_TOP_BACK_LEFT:
-                return PA_CHANNEL_POSITION_TOP_REAR_LEFT;
-        case MATE_MIXER_CHANNEL_TOP_BACK_RIGHT:
-                return PA_CHANNEL_POSITION_TOP_REAR_RIGHT;
-        case MATE_MIXER_CHANNEL_TOP_BACK_CENTER:
-                return PA_CHANNEL_POSITION_TOP_REAR_CENTER;
-        default:
-                return PA_CHANNEL_POSITION_INVALID;
-        }
-}
-#endif
-
-const gchar *
-mvc_channel_position_to_string (MateMixerChannelPosition position)
-{
-#ifdef HAVE_PULSEAUDIO
-        return pa_channel_position_to_string (position_to_pulse (position));
-#endif
-        return NULL;
-}
-
-const gchar *
-mvc_channel_position_to_pretty_string (MateMixerChannelPosition position)
-{
-#ifdef HAVE_PULSEAUDIO
-        return pa_channel_position_to_pretty_string (position_to_pulse (position));
-#endif
-        return NULL;
-}
-
-const gchar *
-mvc_channel_map_to_pretty_string (MateMixerStreamControl *control)
-{
-        g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), NULL);
-
-#define HAS_POSITION(p) (mate_mixer_stream_control_has_channel_position (control, (p)))
-
-        /* Modeled after PulseAudio 5.0, probably could be extended with other combinations */
-        switch (mate_mixer_stream_control_get_num_channels (control)) {
-        case 1:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_MONO))
-                        return _("Mono");
-                break;
-        case 2:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT))
-                        return _("Stereo");
-                break;
-        case 4:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
-                        return _("Surround 4.0");
-                break;
-        case 5:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT))
-                        if (HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                                return _("Surround 4.1");
-                        if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER))
-                                return _("Surround 5.0");
-                break;
-        case 6:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                        return _("Surround 5.1");
-                break;
-        case 8:
-                if (HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_FRONT_CENTER) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_BACK_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_LEFT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_SIDE_RIGHT) &&
-                    HAS_POSITION (MATE_MIXER_CHANNEL_LFE))
-                        return _("Surround 7.1");
-                break;
-        }
-
-#undef HAS_POSITION
-
-        return NULL;
-}
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-/* Taken from gtkstyle.c */
-static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b);
-static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s);
-
-void
-mvc_color_shade (GdkRGBA *a, GdkRGBA *b, gdouble k)
-{
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-
-        red = (gdouble) a->red / 65535.0;
-        green = (gdouble) a->green / 65535.0;
-        blue = (gdouble) a->blue / 65535.0;
-
-        rgb_to_hls (&red, &green, &blue);
-
-        green *= k;
-        if (green > 1.0)
-                green = 1.0;
-        else if (green < 0.0)
-                green = 0.0;
-
-        blue *= k;
-        if (blue > 1.0)
-                blue = 1.0;
-        else if (blue < 0.0)
-                blue = 0.0;
-
-        hls_to_rgb (&red, &green, &blue);
-
-        b->red = red * 65535.0;
-        b->green = green * 65535.0;
-        b->blue = blue * 65535.0;
-}
-
-static void
-rgb_to_hls (gdouble *r, gdouble *g, gdouble *b)
-{
-        gdouble min;
-        gdouble max;
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-        gdouble h, l, s;
-        gdouble delta;
-
-        red = *r;
-        green = *g;
-        blue = *b;
-
-        if (red > green) {
-                if (red > blue)
-                        max = red;
-                else
-                        max = blue;
-
-                if (green < blue)
-                        min = green;
-                else
-                        min = blue;
-        } else {
-                if (green > blue)
-                        max = green;
-                else
-                        max = blue;
-
-                if (red < blue)
-                        min = red;
-                else
-                        min = blue;
-        }
-
-        l = (max + min) / 2;
-        s = 0;
-        h = 0;
-
-        if (max != min) {
-                if (l <= 0.5)
-                        s = (max - min) / (max + min);
-                else
-                        s = (max - min) / (2 - max - min);
-
-                delta = max - min;
-                if (red == max)
-                        h = (green - blue) / delta;
-                else if (green == max)
-                        h = 2 + (blue - red) / delta;
-                else if (blue == max)
-                        h = 4 + (red - green) / delta;
-
-                h *= 60;
-                if (h < 0.0)
-                        h += 360;
-        }
-
-        *r = h;
-        *g = l;
-        *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h, gdouble *l, gdouble *s)
-{
-        gdouble hue;
-        gdouble lightness;
-        gdouble saturation;
-        gdouble m1, m2;
-        gdouble r, g, b;
-
-        lightness = *l;
-        saturation = *s;
-
-        if (lightness <= 0.5)
-                m2 = lightness * (1 + saturation);
-        else
-                m2 = lightness + saturation - lightness * saturation;
-        m1 = 2 * lightness - m2;
-
-        if (saturation == 0) {
-                *h = lightness;
-                *l = lightness;
-                *s = lightness;
-        } else {
-                hue = *h + 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        r = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        r = m2;
-                else if (hue < 240)
-                        r = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        r = m1;
-
-                hue = *h;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        g = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        g = m2;
-                else if (hue < 240)
-                        g = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        g = m1;
-
-                hue = *h - 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        b = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        b = m2;
-                else if (hue < 240)
-                        b = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        b = m1;
-
-                *h = r;
-                *l = g;
-                *s = b;
-        }
-}
-#endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 777790a..2a6f7d0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,18 +1,18 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-mate-volume-control/data/mate-volume-control.desktop.in.in
-mate-volume-control/data/mate-volume-control-applet.desktop.in
-mate-volume-control/src/applet-main.c
-mate-volume-control/src/dialog-main.c
-mate-volume-control/src/gvc-applet.c
-mate-volume-control/src/gvc-balance-bar.c
-mate-volume-control/src/gvc-channel-bar.c
-mate-volume-control/src/gvc-combo-box.c
-mate-volume-control/src/gvc-mixer-dialog.c
-mate-volume-control/src/gvc-speaker-test.c
-mate-volume-control/src/gvc-stream-status-icon.c
-mate-volume-control/src/mvc-helpers.c
-sound-theme/gvc-sound-theme-chooser.c
-sound-theme/sound-theme-file-utils.c
-sound-theme/sounds/mate-sounds-default.xml.in.in
+data/mate-volume-control.desktop.in.in
+data/mate-volume-control-applet.desktop.in
+data/sounds/mate-sounds-default.xml.in.in
+mate-volume-control/applet-main.c
+mate-volume-control/dialog-main.c
+mate-volume-control/gvc-applet.c
+mate-volume-control/gvc-balance-bar.c
+mate-volume-control/gvc-channel-bar.c
+mate-volume-control/gvc-combo-box.c
+mate-volume-control/gvc-mixer-dialog.c
+mate-volume-control/gvc-sound-theme-chooser.c
+mate-volume-control/gvc-speaker-test.c
+mate-volume-control/gvc-stream-status-icon.c
+mate-volume-control/gvc-utils.c
+mate-volume-control/sound-theme-file-utils.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index a19253f..f170964 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,2 @@
-mate-volume-control/data/mate-volume-control.desktop.in
-mate-volume-control/data/sounds/mate-sounds-default.xml.in
-gst-mixer/mate-volume-control.desktop.in
-gstreamer-properties/gstreamer-properties.desktop.in
-profiles/mate-audio-profiles.schemas.in
-sound-theme/sounds/mate-sounds-default.xml.in
+data/mate-volume-control.desktop.in
+data/sounds/mate-sounds-default.xml.in
diff --git a/sound-theme/Makefile.am b/sound-theme/Makefile.am
deleted file mode 100644
index 7cba443..0000000
--- a/sound-theme/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-NULL =
-
-SUBDIRS = sounds
-
-noinst_LTLIBRARIES = libsoundtheme.la
-
-AM_CPPFLAGS =						\
-        $(WARN_CFLAGS)					\
-        $(DISABLE_DEPRECATED)				\
-        $(SOUND_THEME_CFLAGS)				\
-        -DSOUND_DATA_DIR="\"$(datadir)/sounds\""	\
-        -DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
-        $(NULL)
-
-libsoundtheme_la_SOURCES = \
-	gvc-sound-theme-chooser.h		\
-	gvc-sound-theme-chooser.c		\
-	sound-theme-file-utils.h		\
-	sound-theme-file-utils.c		\
-	$(NULL)
-
-libsoundtheme_la_LIBADD = $(SOUND_THEME_LIBS)
-libsoundtheme_la_LDFLAGS = -no-undefined
-
-BUILT_SOURCES =				\
-	$(NULL)
-
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
-
--include $(top_srcdir)/git.mk