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

[Bilal Akhtar]

This branch fixes bug #620326 .

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-13 15:07:18 +0000
+++ debian/changelog	2010-08-19 11:31:41 +0000
@@ -1,3 +1,10 @@
+rhythmbox (0.13.0git20100715-0ubuntu9) maverick; urgency=low
+
+  * debian/patches/07_pause_button.patch:
+    - Remove label from Play/Pause button. (LP: #620326)
+
+ -- Bilal Akhtar <[e-mail]>  Thu, 19 Aug 2010 14:19:55 +0300
+
 rhythmbox (0.13.0git20100715-0ubuntu8) maverick; urgency=low
 
   * debian/control.in:

=== modified file 'debian/patches/07_pause_button.patch'
--- debian/patches/07_pause_button.patch	2010-08-16 18:02:29 +0000
+++ debian/patches/07_pause_button.patch	2010-08-19 11:31:41 +0000
@@ -5,11 +5,9 @@
 Author: Bilal Akhtar <[e-mail]>
 Bug-Ubuntu: https://bugs.edge.launchpad.net/hundredpapercuts/+bug/71228
 Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=326066
-diff --git a/shell/rb-shell-player.c b/shell/rb-shell-player.c
-index 4570d14..be4a03f 100644
 --- a/shell/rb-shell-player.c
 +++ b/shell/rb-shell-player.c
-@@ -305,6 +305,9 @@ enum
+@@ -305,6 +305,9 @@
  
  static GtkActionEntry rb_shell_player_actions [] =
  {
@@ -19,7 +17,7 @@
  	{ "ControlPrevious", GTK_STOCK_MEDIA_PREVIOUS, N_("Pre_vious"), "<alt>Left",
  	  N_("Start playing the previous song"),
  	  G_CALLBACK (rb_shell_player_cmd_previous) },
-@@ -322,9 +325,6 @@ static guint rb_shell_player_n_actions = G_N_ELEMENTS (rb_shell_player_actions);
+@@ -322,9 +325,6 @@
  
  static GtkToggleActionEntry rb_shell_player_toggle_entries [] =
  {
@@ -29,7 +27,17 @@
  	{ "ControlShuffle", GNOME_MEDIA_SHUFFLE, N_("Sh_uffle"), "<control>U",
  	  N_("Play songs in a random order"),
  	  G_CALLBACK (rb_shell_player_shuffle_changed_cb) },
-@@ -3745,7 +3745,6 @@ _idle_unblock_signal_cb (gpointer data)
+@@ -688,9 +688,6 @@
+ 					     rb_shell_player_n_toggle_entries,
+ 					     player);
+ 
+-	action = gtk_action_group_get_action (player->priv->actiongroup,
+-					      "ControlPlay");
+-	g_object_set (action, "is-important", TRUE, NULL);
+ 
+ 	player->priv->syncing_state = TRUE;
+ 	rb_shell_player_set_playing_source (player, NULL);
+@@ -3745,7 +3742,6 @@
  
  	/* sync the active state of the action again */
  	g_object_get (player, "playing", &playing, NULL);
@@ -37,7 +45,7 @@
  
  	g_signal_handlers_unblock_by_func (action, rb_shell_player_cmd_play, player);
  
-@@ -3768,11 +3767,17 @@ rb_shell_player_playing_changed_cb (RBShellPlayer *player,
+@@ -3768,11 +3764,17 @@
  	if (playing) {
  		if (rb_source_can_pause (player->priv->source)) {
  			tooltip = g_strdup (_("Pause playback"));
@@ -55,7 +63,7 @@
  	}
  	g_object_set (action, "tooltip", tooltip, NULL);
  	g_free (tooltip);
-@@ -3784,7 +3789,6 @@ rb_shell_player_playing_changed_cb (RBShellPlayer *player,
+@@ -3784,7 +3786,6 @@
  	if (player->priv->unblock_play_id == 0) {
  		g_signal_handlers_block_by_func (action, rb_shell_player_cmd_play, player);
  	}
@@ -63,15 +71,3 @@
  
  	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),