*** rhythmbox-0.13.0-a/shell/rb-shell-player.c	2010-07-02 06:01:53.000000000 +0200
--- rhythmbox-0.13.0-b/shell/rb-shell-player.c	2010-07-27 14:33:39.000000000 +0200
***************
*** 308,313 ****
--- 308,316 ----
  	{ "ControlPrevious", GTK_STOCK_MEDIA_PREVIOUS, N_("Pre_vious"), "<alt>Left",
  	  N_("Start playing the previous song"),
  	  G_CALLBACK (rb_shell_player_cmd_previous) },
+ 	{ "ControlPlay", GTK_STOCK_MEDIA_PLAY, N_("_Play"), "<control>space",
+ 	  N_("Start playback"),
+ 	  G_CALLBACK (rb_shell_player_cmd_play) },
  	{ "ControlNext", GTK_STOCK_MEDIA_NEXT, N_("_Next"), "<alt>Right",
  	  N_("Start playing the next song"),
  	  G_CALLBACK (rb_shell_player_cmd_next) },
***************
*** 322,330 ****
  
  static GtkToggleActionEntry rb_shell_player_toggle_entries [] =
  {
- 	{ "ControlPlay", GTK_STOCK_MEDIA_PLAY, N_("_Play"), "<control>space",
- 	  N_("Start playback"),
- 	  G_CALLBACK (rb_shell_player_cmd_play) },
  	{ "ControlShuffle", GNOME_MEDIA_SHUFFLE, N_("Sh_uffle"), "<control>U",
  	  N_("Play songs in a random order"),
  	  G_CALLBACK (rb_shell_player_shuffle_changed_cb) },
--- 325,330 ----
***************
*** 688,697 ****
  					     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);
  	rb_shell_player_sync_play_order (player);
--- 688,693 ----
***************
*** 3745,3751 ****
  
  	/* sync the active state of the action again */
  	g_object_get (player, "playing", &playing, NULL);
! 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), playing);
  
  	g_signal_handlers_unblock_by_func (action, rb_shell_player_cmd_play, player);
  
--- 3741,3751 ----
  
  	/* sync the active state of the action again */
  	g_object_get (player, "playing", &playing, NULL);
! 	if (playing) {
! 		gtk_action_set_stock_id (action, GTK_STOCK_MEDIA_PAUSE);
! 	} else {
! 		gtk_action_set_stock_id (action, GTK_STOCK_MEDIA_PLAY);
! 	}
  
  	g_signal_handlers_unblock_by_func (action, rb_shell_player_cmd_play, player);
  
***************
*** 3765,3770 ****
--- 3765,3771 ----
  	g_object_get (player, "playing", &playing, NULL);
  	action = gtk_action_group_get_action (player->priv->actiongroup,
  					      "ControlPlay");
+ 
  	if (playing) {
  		if (rb_source_can_pause (player->priv->source)) {
  			tooltip = g_strdup (_("Pause playback"));
***************
*** 3784,3790 ****
  	if (player->priv->unblock_play_id == 0) {
  		g_signal_handlers_block_by_func (action, rb_shell_player_cmd_play, player);
  	}
! 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), playing);
  
  	if (player->priv->unblock_play_id == 0) {
  		player->priv->unblock_play_id = g_idle_add (_idle_unblock_signal_cb, player);
--- 3785,3795 ----
  	if (player->priv->unblock_play_id == 0) {
  		g_signal_handlers_block_by_func (action, rb_shell_player_cmd_play, player);
  	}
! 	if (playing) {
! 		gtk_action_set_stock_id (action, GTK_STOCK_MEDIA_PAUSE);
! 	} else {
! 		gtk_action_set_stock_id (action, GTK_STOCK_MEDIA_PLAY);
! 	}
  
  	if (player->priv->unblock_play_id == 0) {
  		player->priv->unblock_play_id = g_idle_add (_idle_unblock_signal_cb, player);
*** rhythmbox-0.13.0-a/data/ui/rhythmbox-ui.xml	2010-07-02 06:01:52.000000000 +0200
--- rhythmbox-0.13.0-b/data/ui/rhythmbox-ui.xml	2010-07-26 19:07:51.000000000 +0200
***************
*** 96,103 ****
    </menubar>
  
    <toolbar name="ToolBar">
-     <toolitem name="Play" action="ControlPlay"/>
      <toolitem name="Previous" action="ControlPrevious"/>
      <toolitem name="Next" action="ControlNext"/>
      <separator/>
      <toolitem name="Repeat" action="ControlRepeat"/>
--- 96,103 ----
    </menubar>
  
    <toolbar name="ToolBar">
      <toolitem name="Previous" action="ControlPrevious"/>
+     <toolitem name="Play" action="ControlPlay"/>
      <toolitem name="Next" action="ControlNext"/>
      <separator/>
      <toolitem name="Repeat" action="ControlRepeat"/>
