rpms/gnome-media/F-11 fix-alignment-of-sliders.patch, NONE, 1.1 gnome-media.spec, 1.166, 1.167

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25353

Modified Files:
	gnome-media.spec 
Added Files:
	fix-alignment-of-sliders.patch 
Log Message:
fix alignment of sliders


fix-alignment-of-sliders.patch:

--- NEW FILE fix-alignment-of-sliders.patch ---
diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c hacked/gnome-volume-control/src/gvc-balance-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-03-03 16:26:48.000000000 -0500
+++ hacked/gnome-volume-control/src/gvc-balance-bar.c	2009-04-16 00:00:36.451383748 -0400
@@ -385,7 +385,7 @@
         bar->priv->label = gtk_label_new_with_mnemonic (_("_Balance:"));
         gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
                                 0.0,
-                                0.5);
+                                0.0);
         /* frame */
         frame = gtk_frame_new (NULL);
         gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c hacked/gnome-volume-control/src/gvc-channel-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:10:01.957634048 -0400
+++ hacked/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:01:58.002641476 -0400
@@ -102,6 +102,7 @@
         GtkWidget            *box;
         GtkWidget            *sbox;
         GtkWidget            *ebox;
+        GtkWidget            *alignment;
 
         if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
                 bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
@@ -143,7 +144,6 @@
 
                 gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
                 gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
-
                 gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
 
                 bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
@@ -578,6 +578,7 @@
         	str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
         	gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
         			    GTK_POS_BOTTOM, str);
+		gtk_widget_queue_resize (bar->priv->scale);
         	g_free (str);
 	} else {
 		gtk_scale_clear_marks (GTK_SCALE (bar->priv->scale));
@@ -812,23 +813,23 @@
                           "toggled",
                           G_CALLBACK (on_mute_button_toggled),
                           bar);
-        bar->priv->mute_box = gtk_alignment_new (0.5, 0.5, 0, 0);
+        bar->priv->mute_box = gtk_alignment_new (0.5, 0, 0, 0);
         gtk_container_add (GTK_CONTAINER (bar->priv->mute_box), bar->priv->mute_button);
 
         bar->priv->low_image = gtk_image_new_from_icon_name ("audio-volume-low",
                                                              GTK_ICON_SIZE_BUTTON);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0);
         gtk_widget_set_no_show_all (bar->priv->low_image, TRUE);
         bar->priv->high_image = gtk_image_new_from_icon_name ("audio-volume-high",
                                                               GTK_ICON_SIZE_BUTTON);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0);
         gtk_widget_set_no_show_all (bar->priv->high_image, TRUE);
 
         bar->priv->image = gtk_image_new ();
         gtk_widget_set_no_show_all (bar->priv->image, TRUE);
 
         bar->priv->label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
-                                0.0,
-                                0.5);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.0);
         gtk_widget_set_no_show_all (bar->priv->label, TRUE);
 
         /* frame */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-media.spec	17 Mar 2009 01:55:24 -0000	1.166
+++ gnome-media.spec	16 Apr 2009 04:45:09 -0000	1.167
@@ -20,6 +20,8 @@
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=574312
 Patch3:		gnome-media-add-100-mark.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=579115
+Patch4: 	fix-alignment-of-sliders.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -47,8 +49,6 @@
 BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
 BuildRequires:  unique-devel
-# for patch 0
-BuildRequires:  autoconf automake libtool
 
 %description
 This package contains a few media utilities for the GNOME desktop,
@@ -81,8 +81,7 @@
 pushd gnome-volume-control/src
 %patch3 -p0 -b .amplified-mark
 popd
-
-autoreconf -f -i
+%patch4 -p1 -b .fix-alignment-of-sliders
 
 %build
 # try to work around a problem where gst-inspect does