gnome-media r4238 - in trunk: . gst-mixer/src

[bcameron svn gnome org]

Author: bcameron
Date: Wed Mar  4 21:27:52 2009
New Revision: 4238
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4238&view=rev

Log:
2009-03-04  Brian Cameron  <brian cameron sun com>

        * gst-mixer/src/element.c: Use get_page_description() to get the
          labels rather than duplicating the values in the content
          structure.  Fixes bug #570979.  Patch by Garrett D'Amore
          <garrett damore sun com>


Modified:
   trunk/ChangeLog
   trunk/gst-mixer/src/element.c

Modified: trunk/gst-mixer/src/element.c
==============================================================================
--- trunk/gst-mixer/src/element.c	(original)
+++ trunk/gst-mixer/src/element.c	Wed Mar  4 21:27:52 2009
@@ -227,7 +227,6 @@
 				     GstElement *element)
 {
   struct {
-    gchar *label;
     GtkWidget *page, *old_sep, *new_sep;
     gboolean use;
     gint pos, height, width;
@@ -238,13 +237,13 @@
 						    GtkWidget     *left_sep,
 						    GtkWidget     *right_sep);
   } content[4] = {
-    { _("Playback"), NULL, NULL, NULL, FALSE, 0, 5, 1,
+    { NULL, NULL, NULL, FALSE, 0, 5, 1,
       gnome_volume_control_track_add_playback },
-    { _("Recording"),  NULL, NULL, NULL, FALSE, 0, 5, 1,
+    { NULL, NULL, NULL, FALSE, 0, 5, 1,
       gnome_volume_control_track_add_recording },
-    { _("Switches"), NULL, NULL, NULL, FALSE, 0, 1, 3,
+    { NULL, NULL, NULL, FALSE, 0, 1, 3,
       gnome_volume_control_track_add_switch },
-    { _("Options"),  NULL, NULL, NULL, FALSE, 0, 1, 3,
+    { NULL, NULL, NULL, FALSE, 0, 1, 3,
       gnome_volume_control_track_add_option }
   };
   gint i;
@@ -387,7 +386,7 @@
     gtk_container_add (GTK_CONTAINER (viewport), content[i].page);
     gtk_container_add (GTK_CONTAINER (view), viewport);
 
-    label = gtk_label_new (content[i].label);
+    label = gtk_label_new (get_page_description(i));
     gtk_notebook_append_page (GTK_NOTEBOOK (el), view, label);
     gtk_widget_show (content[i].page);
     gtk_widget_show (viewport);