|
 |
9284be9 |
Index: null_applet/null_applet.c
|
|
|
9284be9 |
===================================================================
|
|
|
9284be9 |
--- null_applet/null_applet.c (revision 11160)
|
|
|
9284be9 |
+++ null_applet/null_applet.c (working copy)
|
|
|
9284be9 |
@@ -40,6 +40,8 @@
|
|
|
9284be9 |
"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
|
|
|
9284be9 |
g_hash_table_insert (hash_table,
|
|
|
9284be9 |
"OAFIID:GNOME_CDPlayerApplet", "CD Player");
|
|
|
9284be9 |
+ g_hash_table_insert (hash_table,
|
|
|
9284be9 |
+ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
|
|
|
9284be9 |
}
|
|
|
9284be9 |
|
|
|
9284be9 |
static gboolean already_running;
|
|
|
9284be9 |
Index: null_applet/GNOME_MixerApplet.server.in
|
|
|
9284be9 |
===================================================================
|
|
|
9284be9 |
--- null_applet/GNOME_MixerApplet.server.in (revision 11160)
|
|
|
9284be9 |
+++ null_applet/GNOME_MixerApplet.server.in (working copy)
|
|
|
9284be9 |
@@ -1,28 +1,15 @@
|
|
|
9284be9 |
<oaf_info>
|
|
|
9284be9 |
|
|
|
9284be9 |
-
|
|
|
9284be9 |
- type="exe"
|
|
|
9284be9 |
- location="@LIBEXECDIR@/mixer_applet2">
|
|
|
9284be9 |
-
|
|
|
9284be9 |
- <oaf_attribute name="repo_ids" type="stringv">
|
|
|
9284be9 |
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
|
|
|
9284be9 |
- <item value="IDL:Bonobo/Unknown:1.0"/>
|
|
|
9284be9 |
- </oaf_attribute>
|
|
|
9284be9 |
- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
|
|
|
9284be9 |
- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-</oaf_server>
|
|
|
9284be9 |
-
|
|
|
9284be9 |
|
|
|
9284be9 |
type="factory"
|
|
|
9284be9 |
- location="OAFIID:GNOME_MixerApplet_Factory">
|
|
|
9284be9 |
+ location="OAFIID:GNOME_NullApplet_Factory">
|
|
|
9284be9 |
|
|
|
9284be9 |
<oaf_attribute name="repo_ids" type="stringv">
|
|
|
9284be9 |
<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
|
|
|
9284be9 |
<item value="IDL:Bonobo/Control:1.0"/>
|
|
|
9284be9 |
<item value="IDL:Bonobo/Unknown:1.0"/>
|
|
|
9284be9 |
</oaf_attribute>
|
|
|
9284be9 |
- <oaf_attribute name="name" type="string" _value="Volume Control"/>
|
|
|
9284be9 |
+ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
|
|
|
9284be9 |
<oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
|
|
|
9284be9 |
<oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
|
|
|
9284be9 |
<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
|
|
|
9284be9 |
|
|
|
9284be9 |
Property changes on: null_applet/GNOME_MixerApplet.server.in
|
|
|
9284be9 |
___________________________________________________________________
|
|
|
9284be9 |
Added: svn:mergeinfo
|
|
|
9284be9 |
|
|
|
9284be9 |
Index: Makefile.am
|
|
|
9284be9 |
===================================================================
|
|
|
9284be9 |
--- Makefile.am (revision 11160)
|
|
|
9284be9 |
+++ Makefile.am (working copy)
|
|
|
9284be9 |
@@ -11,12 +11,6 @@
|
|
|
9284be9 |
libgweather_SUBDIRS = $(libgweather_applets)
|
|
|
9284be9 |
endif
|
|
|
9284be9 |
|
|
|
9284be9 |
-mixer_applets = \
|
|
|
9284be9 |
- mixer
|
|
|
9284be9 |
-if APPLET_MIXER
|
|
|
9284be9 |
-mixer_SUBDIRS = $(mixer_applets)
|
|
|
9284be9 |
-endif
|
|
|
9284be9 |
-
|
|
|
9284be9 |
modemlights_applets = \
|
|
|
9284be9 |
modemlights
|
|
|
9284be9 |
if APPLET_MODEMLIGHTS
|
|
|
9284be9 |
@@ -56,7 +50,6 @@
|
|
|
9284be9 |
SUBDIRS = \
|
|
|
9284be9 |
po \
|
|
|
9284be9 |
$(always_built_SUBDIRS) \
|
|
|
9284be9 |
- $(mixer_SUBDIRS) \
|
|
|
9284be9 |
$(modemlights_SUBDIRS) \
|
|
|
9284be9 |
$(gtop_SUBDIRS) \
|
|
|
9284be9 |
$(libgweather_SUBDIRS) \
|
|
|
9284be9 |
@@ -69,7 +62,6 @@
|
|
|
9284be9 |
|
|
|
9284be9 |
DIST_SUBDIRS = \
|
|
|
9284be9 |
po \
|
|
|
9284be9 |
- mixer \
|
|
|
9284be9 |
modemlights \
|
|
|
9284be9 |
drivemount \
|
|
|
9284be9 |
charpick \
|
|
|
9284be9 |
--- configure.in.old 2008-12-19 14:49:53.000000000 +0000
|
|
|
9284be9 |
+++ configure.in 2008-12-19 14:50:13.000000000 +0000
|
|
|
9284be9 |
@@ -471,69 +471,6 @@ enable_stickynotes="yes"
|
|
|
9284be9 |
AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
|
|
|
9284be9 |
|
|
|
9284be9 |
dnl ***************************************************************************
|
|
|
9284be9 |
-dnl *** mixer applet specific checks ***
|
|
|
9284be9 |
-dnl ***************************************************************************
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-GST_MAJORMINOR=auto
|
|
|
9284be9 |
-AC_ARG_WITH(gstreamer,
|
|
|
9284be9 |
- AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]),
|
|
|
9284be9 |
- [case "${withval}" in
|
|
|
9284be9 |
- 0.8) GST_MAJORMINOR=0.8 ;;
|
|
|
9284be9 |
- 0.10) GST_MAJORMINOR=0.10 ;;
|
|
|
9284be9 |
- *) AC_MSG_ERROR([
|
|
|
9284be9 |
- *** Bad value ${withval} for --with-gstreamer
|
|
|
9284be9 |
- *** Please use one of the following:
|
|
|
9284be9 |
- *** --with-gstreamer=0.8
|
|
|
9284be9 |
- *** --with-gstreamer=0.10
|
|
|
9284be9 |
- ]);;
|
|
|
9284be9 |
- esac])
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-GST10_REQS=0.10.2
|
|
|
9284be9 |
-GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS"
|
|
|
9284be9 |
-GST8_REQS=0.8.0
|
|
|
9284be9 |
-GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS"
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then
|
|
|
9284be9 |
- # try for GStreamer 0.10
|
|
|
9284be9 |
- MIXER_CFLAGS=
|
|
|
9284be9 |
- MIXER_LIBS=
|
|
|
9284be9 |
- PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none)
|
|
|
9284be9 |
-fi
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then
|
|
|
9284be9 |
- # try for GStreamer 0.8
|
|
|
9284be9 |
- MIXER_CFLAGS=
|
|
|
9284be9 |
- MIXER_LIBS=
|
|
|
9284be9 |
- PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none)
|
|
|
9284be9 |
-fi
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-case $HAVE_GST_VER in
|
|
|
9284be9 |
- 0.8|0.10)
|
|
|
9284be9 |
- HAVE_GST="yes"
|
|
|
9284be9 |
- AC_MSG_RESULT([ using GStreamer $HAVE_GST_VER backend])
|
|
|
9284be9 |
- ;;
|
|
|
9284be9 |
- none)
|
|
|
9284be9 |
- HAVE_GST="no"
|
|
|
9284be9 |
- AC_MSG_RESULT([GStreamer not found])
|
|
|
9284be9 |
- AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build])
|
|
|
9284be9 |
- ;;
|
|
|
9284be9 |
- *)
|
|
|
9284be9 |
- AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!])
|
|
|
9284be9 |
- ;;
|
|
|
9284be9 |
-esac
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
|
|
|
9284be9 |
-AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
|
|
|
9284be9 |
-if test "x$HAVE_GST_VER" = "x0.10" ; then
|
|
|
9284be9 |
- AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
|
|
|
9284be9 |
- # these don't seem to come from any pkg-config file
|
|
|
9284be9 |
- MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
|
|
|
9284be9 |
-fi
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-AC_SUBST(MIXER_CFLAGS)
|
|
|
9284be9 |
-AC_SUBST(MIXER_LIBS)
|
|
|
9284be9 |
-
|
|
|
9284be9 |
-dnl ***************************************************************************
|
|
|
9284be9 |
dnl *** keyboard accessibility status applet check ***
|
|
|
9284be9 |
dnl ***************************************************************************
|
|
|
9284be9 |
|
|
|
9284be9 |
@@ -758,8 +695,6 @@ accessx-status/pixmaps/Makefile
|
|
|
9284be9 |
mini-commander/Makefile
|
|
|
9284be9 |
mini-commander/src/Makefile
|
|
|
9284be9 |
mini-commander/help/Makefile
|
|
|
9284be9 |
-mixer/Makefile
|
|
|
9284be9 |
-mixer/docs/Makefile
|
|
|
9284be9 |
drivemount/Makefile
|
|
|
9284be9 |
drivemount/help/Makefile
|
|
|
9284be9 |
modemlights/Makefile
|
|
|
9284be9 |
@@ -833,7 +768,6 @@ gnome-applets-$VERSION configure summary
|
|
|
9284be9 |
- gweather $build_libgweather_applets
|
|
|
9284be9 |
- invest-applet $BUILD_INVEST_APPLET
|
|
|
9284be9 |
- mini-commander $enable_mini_commander
|
|
|
9284be9 |
- - mixer $HAVE_GST
|
|
|
9284be9 |
- modemlights $BUILD_MODEM_LIGHTS
|
|
|
9284be9 |
- multiload $build_gtop_applets
|
|
|
9284be9 |
- stickynotes $enable_stickynotes
|
|
|
9284be9 |
@@ -841,6 +775,5 @@ gnome-applets-$VERSION configure summary
|
|
|
9284be9 |
|
|
|
9284be9 |
Using DBUS: $HAVE_DBUS
|
|
|
9284be9 |
Using HAL: $HAVE_HAL
|
|
|
9284be9 |
- Using GStreamer version: $HAVE_GST_VER
|
|
|
9284be9 |
Enabling IPv6: $have_ipv6
|
|
|
9284be9 |
" >&2
|
|
|
9284be9 |
--- null_applet/Makefile.am.old 2008-12-19 14:49:20.000000000 +0000
|
|
|
9284be9 |
+++ null_applet/Makefile.am 2008-12-19 14:50:13.000000000 +0000
|
|
|
9284be9 |
@@ -19,6 +19,7 @@ server_in_files = \
|
|
|
9284be9 |
GNOME_CDPlayerApplet.server.in \
|
|
|
9284be9 |
GNOME_MailcheckApplet_Factory.server.in \
|
|
|
9284be9 |
GNOME_Panel_WirelessApplet.server.in \
|
|
|
9284be9 |
+ GNOME_MixerApplet.server.in \
|
|
|
9284be9 |
$(battstat_applet)
|
|
|
9284be9 |
server_DATA = $(server_in_files:.server.in=.server)
|
|
|
9284be9 |
|
|
|
9284be9 |
@@ -34,4 +35,6 @@ EXTRA_DIST = \
|
|
|
9284be9 |
GNOME_CDPlayerApplet.server.in \
|
|
|
9284be9 |
GNOME_MailcheckApplet_Factory.server.in \
|
|
|
9284be9 |
GNOME_Panel_WirelessApplet.server.in \
|
|
|
9284be9 |
- GNOME_BattstatApplet.server.in
|
|
|
9284be9 |
+ GNOME_BattstatApplet.server.in \
|
|
|
9284be9 |
+ GNOME_MixerApplet.server.in
|
|
|
9284be9 |
+
|
|
|
f34c5ce |
Index: po/POTFILES.in
|
|
|
f34c5ce |
===================================================================
|
|
|
f34c5ce |
--- po/POTFILES.in (revision 11161)
|
|
|
f34c5ce |
+++ po/POTFILES.in (working copy)
|
|
|
f34c5ce |
@@ -80,13 +80,6 @@
|
|
|
f34c5ce |
mini-commander/src/mini-commander.schemas.in
|
|
|
f34c5ce |
mini-commander/src/mini-commander_applet.c
|
|
|
f34c5ce |
mini-commander/src/preferences.c
|
|
|
f34c5ce |
-mixer/GNOME_MixerApplet.server.in.in
|
|
|
f34c5ce |
-mixer/GNOME_MixerApplet.xml
|
|
|
f34c5ce |
-mixer/applet.c
|
|
|
f34c5ce |
-mixer/dock.c
|
|
|
f34c5ce |
-mixer/load.c
|
|
|
f34c5ce |
-mixer/mixer.schemas.in
|
|
|
f34c5ce |
-mixer/preferences.c
|
|
|
f34c5ce |
modemlights/GNOME_ModemLights.server.in.in
|
|
|
f34c5ce |
modemlights/GNOME_ModemLights.xml
|
|
|
f34c5ce |
modemlights/modem-applet.c
|
|
|
f34c5ce |
Index: po/POTFILES.skip
|
|
|
f34c5ce |
===================================================================
|
|
|
f34c5ce |
--- po/POTFILES.skip (revision 11161)
|
|
|
f34c5ce |
+++ po/POTFILES.skip (working copy)
|
|
|
f34c5ce |
@@ -23,7 +23,6 @@
|
|
|
f34c5ce |
invest-applet/data/financialchart.glade
|
|
|
f34c5ce |
invest-applet/data/prefs-dialog.glade
|
|
|
f34c5ce |
mini-commander/src/mini-commander.glade
|
|
|
f34c5ce |
-mixer/GNOME_MixerApplet.server.in
|
|
|
f34c5ce |
modemlights/GNOME_ModemLights.server.in
|
|
|
f34c5ce |
modemlights/modemlights.glade
|
|
|
f34c5ce |
multiload/GNOME_MultiLoadApplet_Factory.server.in
|