On Tue, 2004-10-19 at 19:16 +0200, Ronald S. Bultje wrote:
> On Tue, 2004-10-19 at 14:27, Kjartan Maraas wrote:
> > Could we get it to drop modems too please? :) I have a nice grey area
> > titled "Intel 82801DB-ICH4 Modem [Alsa Mixer]" in the mixer...
>
> Yes, I'll fix that for GNOME 2.10... Don't we have a bugzilla report for
> that already? I was gonna tell you to send me a patch since it's a
> one-liner (or so), but then decided to just do it. See attach. 5 seconds
> of work. ;). It's untested since I don't have a modem.
Hmm. Is this against the 2.10 sources? We're only shipping 2.8 in FC3.
I came up with the attached patch which Ray Strode tested and confirmed
worked.
--- gnome-media-2.8.0/gst-mixer/src/mixer.c~ 2004-10-19 13:20:05.480784816 -0400
+++ gnome-media-2.8.0/gst-mixer/src/mixer.c 2004-10-19 13:43:31.186085128 -0400
@@ -415,6 +415,8 @@
/* count number of tracks */
tracks = gst_mixer_list_tracks (mixer);
+ if (tracks == NULL)
+ return NULL;
for ( ; tracks != NULL; tracks = tracks->next) {
tablepos += ((GstMixerTrack *) tracks->data)->num_channels;
if (tracks->next != NULL)
@@ -545,6 +547,8 @@
/* create mixer UI object */
page = create_mixer_widget (GST_MIXER (element));
+ if (!page)
+ continue;
if (g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (element)),
"device-name")) {
gchar *devname;
