1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
Index: null_applet/GNOME_MixerApplet.server.in
===================================================================
--- null_applet/GNOME_MixerApplet.server.in (revision 11160)
+++ null_applet/GNOME_MixerApplet.server.in (working copy)
@@ -1,28 +1,15 @@
<oaf_info>
-<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
- type="exe"
- location="@LIBEXECDIR@/mixer_applet2">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
-
-</oaf_server>
-
<oaf_server iid="OAFIID:GNOME_MixerApplet"
type="factory"
- location="OAFIID:GNOME_MixerApplet_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"/>
+ <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"/>
Property changes on: null_applet/GNOME_MixerApplet.server.in
___________________________________________________________________
Added: svn:mergeinfo
Index: Makefile.am
===================================================================
--- Makefile.am (revision 11160)
+++ Makefile.am (working copy)
@@ -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 \
--- configure.in.old 2008-12-19 14:49:53.000000000 +0000
+++ configure.in 2008-12-19 14:50:13.000000000 +0000
@@ -471,69 +471,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 ***************************************************************************
@@ -758,8 +695,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
@@ -833,7 +768,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
@@ -841,6 +775,5 @@ gnome-applets-$VERSION configure summary
Using DBUS: $HAVE_DBUS
Using HAL: $HAVE_HAL
- Using GStreamer version: $HAVE_GST_VER
Enabling IPv6: $have_ipv6
" >&2
--- null_applet/Makefile.am.old 2008-12-19 14:49:20.000000000 +0000
+++ null_applet/Makefile.am 2008-12-19 14:50:13.000000000 +0000
@@ -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
+
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in (revision 11161)
+++ po/POTFILES.in (working copy)
@@ -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
Index: po/POTFILES.skip
===================================================================
--- po/POTFILES.skip (revision 11161)
+++ po/POTFILES.skip (working copy)
@@ -23,7 +23,6 @@
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
--- null_applet/null_applet.c.mixer-null 2008-12-19 16:59:48.000000000 +0000
+++ null_applet/null_applet.c 2008-12-19 17:00:26.000000000 +0000
@@ -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;
|
