gnome-media r4054 - in trunk/gnome-volume-control: . src

[mccann svn gnome org]

Author: mccann
Date: Wed Nov 12 19:15:32 2008
New Revision: 4054
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4054&view=rev

Log:
2008-11-12  William Jon McCann  <jmccann redhat com>

	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
	* src/gvc-sound-theme-chooser.c (gvc_sound_theme_chooser_init):
	Move alert and input sliders to the top.



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/gvc-mixer-dialog.c
   trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c

Modified: trunk/gnome-volume-control/src/gvc-mixer-dialog.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-mixer-dialog.c	(original)
+++ trunk/gnome-volume-control/src/gvc-mixer-dialog.c	Wed Nov 12 19:15:32 2008
@@ -598,8 +598,8 @@
         gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->effects_bar),
                                   _("Alert Volume: "));
         gtk_widget_set_sensitive (self->priv->effects_bar, FALSE);
-        gtk_box_pack_end (GTK_BOX (self->priv->sound_effects_box),
-                          self->priv->effects_bar, FALSE, FALSE, 12);
+        gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
+                            self->priv->effects_bar, FALSE, FALSE, 12);
 
         client = gconf_client_get_default ();
 
@@ -688,8 +688,8 @@
         gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar),
                                   _("Input volume: "));
         gtk_widget_set_sensitive (self->priv->input_bar, FALSE);
-        gtk_box_pack_end (GTK_BOX (self->priv->input_box),
-                          self->priv->input_bar, FALSE, FALSE, 12);
+        gtk_box_pack_start (GTK_BOX (self->priv->input_box),
+                            self->priv->input_bar, FALSE, FALSE, 12);
 
         box = gtk_frame_new (_("Choose a device for sound input"));
         label = gtk_frame_get_label_widget (GTK_FRAME (box));

Modified: trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c	(original)
+++ trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c	Wed Nov 12 19:15:32 2008
@@ -1029,6 +1029,7 @@
 typedef GtkCellRendererPixbuf      ActivatableCellRendererPixbuf;
 typedef GtkCellRendererPixbufClass ActivatableCellRendererPixbufClass;
 
+GType activatable_cell_renderer_pixbuf_get_type (void);
 #define ACTIVATABLE_TYPE_CELL_RENDERER_PIXBUF (activatable_cell_renderer_pixbuf_get_type ())
 G_DEFINE_TYPE (ActivatableCellRendererPixbuf, activatable_cell_renderer_pixbuf, GTK_TYPE_CELL_RENDERER_PIXBUF);
 
@@ -1461,6 +1462,8 @@
         chooser->priv->combo_box = gtk_combo_box_new ();
         gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 0);
 
+        /* FIXME: should accept drag and drop themes.  should also
+           add an "Add Theme..." item to the theme combobox */
 }
 
 static void