Index: bindings/python/rb.defs
===================================================================
RCS file: /cvs/gnome/rhythmbox/bindings/python/rb.defs,v
retrieving revision 1.11
diff -u -u -r1.11 rb.defs
--- bindings/python/rb.defs	22 Apr 2006 06:38:05 -0000	1.11
+++ bindings/python/rb.defs	25 Apr 2006 05:22:51 -0000
@@ -552,7 +552,7 @@
   (c-name "rb_shell_player_playpause")
   (return-type "gboolean")
   (parameters
-    '("gboolean" "ignore_stop")
+    '("gboolean" "unused")
     '("GError**" "error")
   )
 )
Index: shell/rb-shell-player.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell-player.c,v
retrieving revision 1.237
diff -u -u -r1.237 rb-shell-player.c
--- shell/rb-shell-player.c	20 Apr 2006 20:43:29 -0000	1.237
+++ shell/rb-shell-player.c	25 Apr 2006 05:23:00 -0000
@@ -1584,13 +1584,13 @@
 {
 	GError *error = NULL;
 	rb_debug ("play!");
-	if (!rb_shell_player_playpause (player, FALSE, &error))
+	if (!rb_shell_player_play (player, &error))
 		rb_error_dialog (NULL, _("Couldn't start playback: %s"), (error) ? error->message : "(null)");
 	g_clear_error (&error);
 }
 
 gboolean
-rb_shell_player_playpause (RBShellPlayer *player, gboolean ignore_stop, GError **error)
+rb_shell_player_playpause (RBShellPlayer *player, gboolean unused, GError **error)
 {
 	gboolean ret;
 	RBEntryView *songs;
@@ -1610,7 +1610,7 @@
 			songs = rb_source_get_entry_view (player->priv->current_playing_source);
 			if (songs)
 				rb_entry_view_set_state (songs, RB_ENTRY_VIEW_PAUSED);
-		} else if (!ignore_stop) {
+		} else {
 			rb_debug ("setting playing source to NULL");
 			rb_shell_player_set_playing_source (player, NULL);
 		}
@@ -2742,7 +2742,7 @@
 	player = (RBShellPlayer *)data;
 
 	if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPlay) == key->keycode) {	
-		rb_shell_player_playpause (player, TRUE, NULL);
+		rb_shell_player_playpause (player, FALSE, NULL);
 		return GDK_FILTER_REMOVE;
 	} else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause) == key->keycode) {	
 		rb_shell_player_pause (player, NULL);
Index: shell/rb-shell-player.h
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell-player.h,v
retrieving revision 1.41
diff -u -u -r1.41 rb-shell-player.h
--- shell/rb-shell-player.h	20 Apr 2006 20:43:29 -0000	1.41
+++ shell/rb-shell-player.h	25 Apr 2006 05:23:02 -0000
@@ -95,7 +95,7 @@
 							 RhythmDBEntry *entry);
 gboolean		rb_shell_player_play		(RBShellPlayer *player, GError **error);
 gboolean		rb_shell_player_pause		(RBShellPlayer *player, GError **error);
-gboolean                rb_shell_player_playpause	(RBShellPlayer *player, gboolean ignore_stop, GError **error);
+gboolean                rb_shell_player_playpause	(RBShellPlayer *player, gboolean unused, GError **error);
 void			rb_shell_player_stop		(RBShellPlayer *player);
 gboolean                rb_shell_player_do_previous	(RBShellPlayer *player, GError **error);
 gboolean		rb_shell_player_do_next		(RBShellPlayer *player, GError **error);
Index: shell/rb-shell.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell.c,v
retrieving revision 1.440
diff -u -u -r1.440 rb-shell.c
--- shell/rb-shell.c	22 Apr 2006 08:12:33 -0000	1.440
+++ shell/rb-shell.c	25 Apr 2006 05:23:03 -0000
@@ -1687,7 +1687,7 @@
 	rb_shell_select_source (shell, source);
 	rb_shell_player_set_playing_source (shell->priv->player_shell, source);
 	/* Ignore error from here */
-	rb_shell_player_playpause (shell->priv->player_shell, FALSE, NULL);
+	rb_shell_player_play (shell->priv->player_shell, NULL);
 }
 
 static void
@@ -3335,7 +3335,7 @@
 {
 	RBShellPlayer *player = RB_SHELL (proxy)->priv->player_shell;
 	/* These interfaces are busted...need a way to signal errors */
-	rb_shell_player_playpause (player, TRUE, NULL);
+	rb_shell_player_play (player, NULL);
 }
 
 static void
@@ -3343,7 +3343,7 @@
 {
 	RBShellPlayer *player = RB_SHELL (proxy)->priv->player_shell;
 	/* These interfaces are busted...need a way to signal errors */
-	rb_shell_player_playpause (player, TRUE, NULL);
+	rb_shell_player_pause (player, NULL);
 }
 
 static gboolean
