--- gnome-media-2.24.0.1/gst-mixer/src/element.c-orig	2009-03-06 15:11:56.690723000 -0600

+++ gnome-media-2.24.0.1/gst-mixer/src/element.c	2009-03-06 15:13:22.909421000 -0600

@@ -252,15 +252,13 @@ gnome_volume_control_element_change (Gno

 						    GtkWidget     *right_sep,

 						    GtkWidget     *flagbox);

-  } content[4] = {

+  } content[3] = {

     { NULL, NULL, NULL, NULL, FALSE, 0, 5, 1,

       gnome_volume_control_track_add_playback },

     { NULL, NULL, NULL, NULL, FALSE, 0, 5, 1,

       gnome_volume_control_track_add_recording },

     { NULL, NULL, NULL, NULL, FALSE, 0, 1, 3,

       gnome_volume_control_track_add_playback },

-    { NULL, NULL, NULL, NULL, FALSE, 0, 1, 3,

-      gnome_volume_control_track_add_option }

   };

   static gboolean theme_page = FALSE;

   const GList *item;

@@ -307,7 +305,7 @@ gnome_volume_control_element_change (Gno

   }

   /* content pages */

-  for (i = 0; i < 4; i++) {

+  for (i = 0; i < 3; i++) {

     content[i].page = gtk_table_new (content[i].width, content[i].height, FALSE);

     gtk_container_set_border_width (GTK_CONTAINER (content[i].page), 6);

     if (i >= 2)

@@ -332,12 +330,10 @@ gnome_volume_control_element_change (Gno

      *     _of this type_. We currently destroy it at the

      *     end, so it's not critical, but not nice either.

      */

-    if (i == 3) {

+    if (i == 2) {

       content[i].new_sep = gtk_hseparator_new ();

-    } else if (i < 2) {

-      content[i].new_sep = gtk_vseparator_new ();

     } else {

-      content[i].new_sep = NULL;

+      content[i].new_sep = gtk_vseparator_new ();

     }

     /* visible? */

@@ -395,7 +391,7 @@ gnome_volume_control_element_change (Gno

   /* show - need to build the tabs backwards so that deleting the "Sound Theme"

    * page can be avoided.

    */

-  for (i = 3; i >= 0; i--) {

+  for (i = 2; i >= 0; i--) {

     GtkWidget *label, *view, *viewport;

     GtkAdjustment *hadjustment, *vadjustment;

@@ -542,7 +538,7 @@ cb_gconf (GConfClient *client,

         if (value->type == GCONF_VALUE_BOOL) {

           gboolean active = gconf_value_get_bool (value),

-		   first[4] = { TRUE, TRUE, TRUE, TRUE };

+		   first[3] = { TRUE, TRUE, TRUE };

           gint n, page = get_page_num (el->mixer, track);

           gnome_volume_control_track_show (trkw, active);

--- gnome-media-2.24.0.1/gst-mixer/src/misc.c	2009-03-05 14:33:09.453181745 -0800

+++ gnome-media-2.24.0.1/gst-mixer/src/misc.c	2009-03-05 14:47:07.165228853 -0800

@@ -37,17 +37,13 @@

         if ((gst_mixer_get_mixer_flags (GST_MIXER (mixer)) &

                 GST_MIXER_FLAG_GROUPING) == 0) {

                 /* old style grouping, only volume sliders on the first two pages */

-               if (GST_IS_MIXER_OPTIONS (track))

-                        return 3;

-                else if (track->num_channels == 0)

+                if (track->num_channels == 0)

                         return 2;

         }

         if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_INPUT))

                 return 1;

         else if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_OUTPUT))

                 return 0;

-        else if (GST_IS_MIXER_OPTIONS (track))

-                return 3;

         else

                 return 2;

@@ -56,15 +52,12 @@

 gchar *get_page_description (gint n)

 {

-	/* needs i18n work */

 	switch (n) {

 	case 0:

 		return _("Playback");

 	case 1:

 		return _("Recording");

 	case 2:

-		return _("Switches");

-	case 3:

 		return _("Options");

 	}