Merge lp:~bilalakhtar/ubuntu/maverick/rhythmbox/fix-615248 into lp:ubuntu/maverick/rhythmbox

[Bilal Akhtar]

This branch fixes bug #615248 .

[lp:~bilalakhtar/ubuntu/maverick/rhythmbox/fix-615248]

168. By Bilal Akhtar on 2010-08-16

Merged patches

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-06 15:20:37 +0000
+++ debian/changelog	2010-08-16 15:05:56 +0000
@@ -1,3 +1,12 @@
+rhythmbox (0.13.0git20100715-0ubuntu6) maverick; urgency=low
+
+  * debian/patches/07_pause_button.patch:
+    - Modify patch to set width of Play button a bit higher than normal
+      so that the button size does not change when its label is changed
+      to Pause. (LP: #615248)
+
+ -- Bilal Akhtar <[e-mail]>  Mon, 16 Aug 2010 18:02:29 +0300
+
 rhythmbox (0.13.0git20100715-0ubuntu5) maverick; urgency=low
 
   * debian/patches/07_pause_button.patch:

=== modified file 'debian/patches/07_pause_button.patch'
--- debian/patches/07_pause_button.patch	2010-08-06 15:20:37 +0000
+++ debian/patches/07_pause_button.patch	2010-08-16 15:05:56 +0000
@@ -63,3 +63,15 @@
  
  	if (player->priv->unblock_play_id == 0) {
  		player->priv->unblock_play_id = g_idle_add (_idle_unblock_signal_cb, player);
+--- a/shell/rb-shell.c
++++ b/shell/rb-shell.c
+@@ -1478,6 +1478,9 @@
+ 	toolbar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar");
+ 	gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0);
+ 
++	GtkWidget* playbutton = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar/Play");
++	gtk_widget_set_size_request(GTK_WIDGET(playbutton), 80, -1);
++
+ 	shell->priv->volume_button = gtk_volume_button_new ();
+ 	g_signal_connect (shell->priv->volume_button, "value-changed",
+ 			  G_CALLBACK (rb_shell_volume_widget_changed_cb),