GNOME.org
 

gnome-applets r11175 - in trunk: . invest-applet mixer null_applet po

Author: callum
Date: Tue Jan  6 05:48:15 2009
New Revision: 11175
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11175&view=rev

Log:
The great mixer removal of 2009. It has moved to gnome-media.

Added:
   trunk/null_applet/GNOME_MixerApplet.server.in
Removed:
   trunk/mixer/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/invest-applet/ChangeLog
   trunk/null_applet/ChangeLog
   trunk/null_applet/Makefile.am
   trunk/null_applet/null_applet.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jan  6 05:48:15 2009
@@ -11,12 +11,6 @@
 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 @@
 SUBDIRS = \
 	po			\
 	$(always_built_SUBDIRS)	\
-	$(mixer_SUBDIRS)	\
 	$(modemlights_SUBDIRS)	\
 	$(gtop_SUBDIRS)		\
 	$(libgweather_SUBDIRS)	\
@@ -69,7 +62,6 @@
 
 DIST_SUBDIRS = \
 	po		\
-	mixer		\
 	modemlights	\
 	drivemount	\
 	charpick	\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan  6 05:48:15 2009
@@ -485,69 +485,6 @@
 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 @@
 mini-commander/Makefile
 mini-commander/src/Makefile
 mini-commander/help/Makefile
-mixer/Makefile
-mixer/docs/Makefile
 drivemount/Makefile
 drivemount/help/Makefile
 modemlights/Makefile
@@ -842,7 +777,6 @@
 	 - 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
@@ -851,6 +785,5 @@
 	Using DBUS:			$HAVE_DBUS
 	Using NetworkManager:		$HAVE_NETWORKMANAGER
 	Using HAL:			$HAVE_HAL
-	Using GStreamer version:	$HAVE_GST_VER
 	Enabling IPv6:			$have_ipv6
 " >&2

Added: trunk/null_applet/GNOME_MixerApplet.server.in
==============================================================================
--- (empty file)
+++ trunk/null_applet/GNOME_MixerApplet.server.in	Tue Jan  6 05:48:15 2009
@@ -0,0 +1,22 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_MixerApplet"
+	    type="factory" 
+	    location="OAFIID:GNOME_NullApplet_Factory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
+	<oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+	<oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
+	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+        <oaf_attribute name="bugzilla:component" type="string" value="mixer"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="mixer_applet2"/>
+
+</oaf_server>
+
+</oaf_info>

Modified: trunk/null_applet/Makefile.am
==============================================================================
--- trunk/null_applet/Makefile.am	(original)
+++ trunk/null_applet/Makefile.am	Tue Jan  6 05:48:15 2009
@@ -14,7 +14,8 @@
 	GNOME_NullApplet_Factory.server.in	\
 	GNOME_CDPlayerApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
-	GNOME_Panel_WirelessApplet.server.in
+	GNOME_Panel_WirelessApplet.server.in	\
+	GNOME_MixerApplet.server.in
 server_DATA = $(server_in_files:.server.in=.server)
 
 @INTLTOOL_SERVER_RULE@
@@ -28,4 +29,5 @@
 	GNOME_NullApplet_Factory.server.in.in	\
 	GNOME_CDPlayerApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
-	GNOME_Panel_WirelessApplet.server.in
+	GNOME_Panel_WirelessApplet.server.in	\
+	GNOME_MixerApplet.server.in

Modified: trunk/null_applet/null_applet.c
==============================================================================
--- trunk/null_applet/null_applet.c	(original)
+++ trunk/null_applet/null_applet.c	Tue Jan  6 05:48:15 2009
@@ -40,6 +40,8 @@
 			"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
 	g_hash_table_insert (hash_table,
 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
+	g_hash_table_insert (hash_table,
+			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
 }
 
 static gboolean already_running;

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Jan  6 05:48:15 2009
@@ -80,13 +80,6 @@
 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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]