diff -up gnome-applets-2.25.2/configure.in.mixer-null gnome-applets-2.25.2/configure.in --- gnome-applets-2.25.2/configure.in.mixer-null 2008-12-20 16:30:09.000000000 -0500 +++ gnome-applets-2.25.2/configure.in 2008-12-20 16:31:52.000000000 -0500 @@ -483,69 +483,6 @@ enable_stickynotes="yes" AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes") dnl *************************************************************************** -dnl *** mixer applet specific checks *** -dnl *************************************************************************** - -GST_MAJORMINOR=auto -AC_ARG_WITH(gstreamer, - AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]), - [case "${withval}" in - 0.8) GST_MAJORMINOR=0.8 ;; - 0.10) GST_MAJORMINOR=0.10 ;; - *) AC_MSG_ERROR([ - *** Bad value ${withval} for --with-gstreamer - *** Please use one of the following: - *** --with-gstreamer=0.8 - *** --with-gstreamer=0.10 - ]);; - esac]) - -GST10_REQS=0.10.2 -GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS" -GST8_REQS=0.8.0 -GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS" - -if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then - # try for GStreamer 0.10 - MIXER_CFLAGS= - MIXER_LIBS= - PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none) -fi - -if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then - # try for GStreamer 0.8 - MIXER_CFLAGS= - MIXER_LIBS= - PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none) -fi - -case $HAVE_GST_VER in - 0.8|0.10) - HAVE_GST="yes" - AC_MSG_RESULT([ using GStreamer $HAVE_GST_VER backend]) - ;; - none) - HAVE_GST="no" - AC_MSG_RESULT([GStreamer not found]) - AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build]) - ;; - *) - AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!]) - ;; -esac - -AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes") -AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10") -if test "x$HAVE_GST_VER" = "x0.10" ; then - AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10]) - # these don't seem to come from any pkg-config file - MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10" -fi - -AC_SUBST(MIXER_CFLAGS) -AC_SUBST(MIXER_LIBS) - -dnl *************************************************************************** dnl *** keyboard accessibility status applet check *** dnl *************************************************************************** @@ -770,8 +707,6 @@ accessx-status/pixmaps/Makefile mini-commander/Makefile mini-commander/src/Makefile mini-commander/help/Makefile -mixer/Makefile -mixer/docs/Makefile drivemount/Makefile drivemount/help/Makefile modemlights/Makefile @@ -845,7 +780,6 @@ gnome-applets-$VERSION configure summary - gweather $build_libgweather_applets - invest-applet $BUILD_INVEST_APPLET - mini-commander $enable_mini_commander - - mixer $HAVE_GST - modemlights $BUILD_MODEM_LIGHTS - multiload $build_gtop_applets - stickynotes $enable_stickynotes @@ -854,6 +788,5 @@ gnome-applets-$VERSION configure summary Using DBUS: $HAVE_DBUS Using NetworkManager: $HAVE_NETWORKMANAGER Using HAL: $HAVE_HAL - Using GStreamer version: $HAVE_GST_VER Enabling IPv6: $have_ipv6 " >&2 diff -up gnome-applets-2.25.2/Makefile.am.mixer-null gnome-applets-2.25.2/Makefile.am --- gnome-applets-2.25.2/Makefile.am.mixer-null 2008-12-20 00:35:19.000000000 -0500 +++ gnome-applets-2.25.2/Makefile.am 2008-12-20 16:30:09.000000000 -0500 @@ -11,12 +11,6 @@ if BUILD_LIBGWEATHER_APPLETS libgweather_SUBDIRS = $(libgweather_applets) endif -mixer_applets = \ - mixer -if APPLET_MIXER -mixer_SUBDIRS = $(mixer_applets) -endif - modemlights_applets = \ modemlights if APPLET_MODEMLIGHTS @@ -56,7 +50,6 @@ always_built_SUBDIRS = \ SUBDIRS = \ po \ $(always_built_SUBDIRS) \ - $(mixer_SUBDIRS) \ $(modemlights_SUBDIRS) \ $(gtop_SUBDIRS) \ $(libgweather_SUBDIRS) \ @@ -69,7 +62,6 @@ SUBDIRS = \ DIST_SUBDIRS = \ po \ - mixer \ modemlights \ drivemount \ charpick \ diff -up gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in --- gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null 2008-12-20 00:34:05.000000000 -0500 +++ gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in 2008-12-20 16:30:09.000000000 -0500 @@ -1,28 +1,15 @@ - - - - - - - - - - - + location="OAFIID:GNOME_NullApplet_Factory"> - + diff -up gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null gnome-applets-2.25.2/null_applet/Makefile.am --- gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null 2008-12-20 16:30:09.000000000 -0500 +++ gnome-applets-2.25.2/null_applet/Makefile.am 2008-12-20 16:30:09.000000000 -0500 @@ -19,6 +19,7 @@ server_in_files = \ GNOME_CDPlayerApplet.server.in \ GNOME_MailcheckApplet_Factory.server.in \ GNOME_Panel_WirelessApplet.server.in \ + GNOME_MixerApplet.server.in \ $(battstat_applet) server_DATA = $(server_in_files:.server.in=.server) @@ -34,4 +35,6 @@ EXTRA_DIST = \ GNOME_CDPlayerApplet.server.in \ GNOME_MailcheckApplet_Factory.server.in \ GNOME_Panel_WirelessApplet.server.in \ - GNOME_BattstatApplet.server.in + GNOME_BattstatApplet.server.in \ + GNOME_MixerApplet.server.in + diff -up gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null gnome-applets-2.25.2/null_applet/null_applet.c --- gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null 2008-12-20 16:30:09.000000000 -0500 +++ gnome-applets-2.25.2/null_applet/null_applet.c 2008-12-20 16:30:09.000000000 -0500 @@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table) "OAFIID:GNOME_CDPlayerApplet", "CD Player"); g_hash_table_insert (hash_table, "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor"); + g_hash_table_insert (hash_table, + "OAFIID:GNOME_MixerApplet_Factory", "Volume Control"); } static gboolean already_running; diff -up gnome-applets-2.25.2/po/POTFILES.in.mixer-null gnome-applets-2.25.2/po/POTFILES.in --- gnome-applets-2.25.2/po/POTFILES.in.mixer-null 2008-12-20 03:22:15.000000000 -0500 +++ gnome-applets-2.25.2/po/POTFILES.in 2008-12-20 16:30:09.000000000 -0500 @@ -80,13 +80,6 @@ mini-commander/src/mini-commander-global mini-commander/src/mini-commander.schemas.in mini-commander/src/mini-commander_applet.c mini-commander/src/preferences.c -mixer/GNOME_MixerApplet.server.in.in -mixer/GNOME_MixerApplet.xml -mixer/applet.c -mixer/dock.c -mixer/load.c -mixer/mixer.schemas.in -mixer/preferences.c modemlights/GNOME_ModemLights.server.in.in modemlights/GNOME_ModemLights.xml modemlights/modem-applet.c diff -up gnome-applets-2.25.2/po/POTFILES.skip.mixer-null gnome-applets-2.25.2/po/POTFILES.skip --- gnome-applets-2.25.2/po/POTFILES.skip.mixer-null 2008-12-20 00:33:44.000000000 -0500 +++ gnome-applets-2.25.2/po/POTFILES.skip 2008-12-20 16:30:09.000000000 -0500 @@ -23,7 +23,6 @@ invest-applet/data/Invest_Applet.server. invest-applet/data/financialchart.glade invest-applet/data/prefs-dialog.glade mini-commander/src/mini-commander.glade -mixer/GNOME_MixerApplet.server.in modemlights/GNOME_ModemLights.server.in modemlights/modemlights.glade multiload/GNOME_MultiLoadApplet_Factory.server.in