8 files changed, 14 insertions, 89 deletions
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index 015a973..0000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-pkgname=mate-media
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="MATE Media Tools"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gstreamer0.10-base-plugins' 'mate-panel' 'libmatenotify' 'pulseaudio')
-makedepends=('mate-doc-utils' 'pkgconfig' 'mate-settings-daemon' 'intltool' 'mate-icon-theme' 'libpulse')
-groups=('mate-extras')
-options=(!emptydirs !libtool)
-url="http://matsusoft.com.ar/projects"
-install=mate-media.install
-source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download)
-sha256sums=('9a2051c67bfdb9fc9dd2e55a3c0d733b4b230a3ef1d9c0a5bf2aac11ea068189')
-
-build() {
- cd "${srcdir}/${pkgname}"
-
- # brute force
- #mate-doc-prepare --force --copy
- #automake
- #autoconf
- #autoreconf -i --force
- #aclocal
- #intltoolize --automake --copy --force
- #automake --add-missing
-
- # Optional Features:
- # --enable-pulseaudio Enable PulseAudio support [default=auto]
- # --enable-profiles enable mate media profiles
- # --enable-grecord enable mate sound recorder
- # --enable-gstprops enable gstreamer properties
- # --enable-gstmix enable gstreamer mixer
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/${pkgname} \
- --localstatedir=/var --disable-static \
- --disable-schemas-install \
- --disable-scrollkeeper \
- --enable-pulseaudio \
- --enable-profiles --enable-grecord \
- --enable-gstprops --enable-gstmix || return 1
-
- make || return 1
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
-
- make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
- #rm -f ${pkgdir}/usr/lib/*.la # can be used options=(!libtools)
-
- install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
- mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
- rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-}
diff --git a/distro/archlinux/mate-media.install b/distro/archlinux/mate-media.install
deleted file mode 100644
index 4662445..0000000
--- a/distro/archlinux/mate-media.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=mate-media
-
-post_install() {
- usr/sbin/mateconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/mateconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/gst-mixer-applet/applet.c b/gst-mixer-applet/applet.c
index 9ad53bb..1a511ed 100644
--- a/gst-mixer-applet/applet.c
+++ b/gst-mixer-applet/applet.c
@@ -827,7 +827,9 @@ mate_volume_applet_button (GtkWidget *widget,
 break;
 }
 break;
- case 2: /* move */
+ case 2: /* mute */
+ mate_volume_applet_toggle_mute (applet);
+ return TRUE;
 case 3: /* menu */
 if (applet->pop) {
 mate_volume_applet_popdown_dock (applet);
diff --git a/gst-mixer-applet/docs/C/mate-mixer_applet2.xml b/gst-mixer-applet/docs/C/mate-mixer_applet2.xml
index 7bc1f20..a6ba3dc 100644
--- a/gst-mixer-applet/docs/C/mate-mixer_applet2.xml
+++ b/gst-mixer-applet/docs/C/mate-mixer_applet2.xml
@@ -98,7 +98,7 @@
 <revnumber>Volume Control Applet Manual V2.6</revnumber> 
 <date>February 2004</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
@@ -107,7 +107,7 @@
 <revnumber>Volume Control Applet Manual V2.5</revnumber> 
 <date>September 2003</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
@@ -116,7 +116,7 @@
 <revnumber>Volume Control Applet Manual V2.4</revnumber> 
 <date>August 2003</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
@@ -125,7 +125,7 @@
 <revnumber>Volume Control Applet Manual V2.3</revnumber> 
 <date>March 2003</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
@@ -134,7 +134,7 @@
 <revnumber>Volume Control Applet Manual V2.2</revnumber> 
 <date>January 2003</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
@@ -143,7 +143,7 @@
 <revnumber>Volume Control Applet Manual V2.1</revnumber> 
 <date>August 2002</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
@@ -152,7 +152,7 @@
 <revnumber>Volume Control Applet Manual V2.0</revnumber> 
 <date>April 2002</date> 
 <revdescription> 
- <para role="author">Sun MATE Documentation Team
+ <para role="author">Sun GNOME Documentation Team
 </para> 
 <para role="publisher">MATE Documentation Project</para> 
 </revdescription> 
diff --git a/gst-mixer/doc/C/mate-volume-control.xml b/gst-mixer/doc/C/mate-volume-control.xml
index 9f6619d..37fc7df 100644
--- a/gst-mixer/doc/C/mate-volume-control.xml
+++ b/gst-mixer/doc/C/mate-volume-control.xml
@@ -127,7 +127,7 @@
 <revnumber>&appname; Manual V&manrevision;</revnumber>
 <date>&date;</date>
 <revdescription>
- <para role="author">Sun MATE Documentation Team</para>
+ <para role="author">Sun GNOME Documentation Team</para>
 <para role="publisher">MATE Documentation Project</para>
 </revdescription>
 </revision>
diff --git a/gst-mixer/mate-volume-control.desktop.in.in b/gst-mixer/mate-volume-control.desktop.in.in
index e14a04d..bfa4d60 100644
--- a/gst-mixer/mate-volume-control.desktop.in.in
+++ b/gst-mixer/mate-volume-control.desktop.in.in
@@ -8,7 +8,7 @@ StartupNotify=true
 X-Info=Mate Mixer
 Terminal=false
 Type=Application
-Categories=GTK;Settings;HardwareSettings;
+Categories=AudioVideo;Mixer;Settings;HardwareSettings;
 X-MATE-DocPath=gst-mixer/mate-volume-control.xml
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-media
diff --git a/mate-volume-control/data/mate-volume-control-applet.desktop.in b/mate-volume-control/data/mate-volume-control-applet.desktop.in
index 2977ae6..90f9ee3 100644
--- a/mate-volume-control/data/mate-volume-control-applet.desktop.in
+++ b/mate-volume-control/data/mate-volume-control-applet.desktop.in
@@ -5,7 +5,7 @@ Icon=multimedia-volume-control
 Exec=mate-volume-control-applet
 Terminal=false
 Type=Application
-Categories=GTK;Settings;HardwareSettings;
+Categories=AudioVideo;Mixer;Settings;HardwareSettings;
 NoDisplay=true
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/mate-volume-control/data/mate-volume-control.desktop.in.in b/mate-volume-control/data/mate-volume-control.desktop.in.in
index 7005d13..341e99d 100644
--- a/mate-volume-control/data/mate-volume-control.desktop.in.in
+++ b/mate-volume-control/data/mate-volume-control.desktop.in.in
@@ -6,7 +6,7 @@ Icon=multimedia-volume-control
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=MATE;GTK;Settings;HardwareSettings;
+Categories=AudioVideo;Mixer;Settings;HardwareSettings;
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-media