[totem/gnome-3-4] main: Fix sidebar related warnings on startup

[Bastien Nocera <hadess src gnome org>]

commit 106b8dcb87ad3ec8fab4ca7865b1c01bd2aa7f29
Author: Bastien Nocera <hadess hadess net>
Date:   Fri May 25 14:34:04 2012 +0100

    main: Fix sidebar related warnings on startup
    
    When the last used sidebar was from a plugin, we would try
    and set it before the plugins were loaded.

 src/totem-object.c  |    2 +-
 src/totem-sidebar.c |    7 +------
 src/totem-sidebar.h |    3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 882afeb..111f210 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -4031,7 +4031,7 @@ totem_setup_window (TotemObject *totem)
 	gdk_rgba_parse (&black, "Black");
 	gtk_widget_override_background_color (vbox, (GTK_STATE_FLAG_FOCUSED << 1), &black);
 
-	totem_sidebar_setup (totem, show_sidebar, page_id);
+	totem_sidebar_setup (totem, show_sidebar);
 	return page_id;
 }
 
diff --git a/src/totem-sidebar.c b/src/totem-sidebar.c
index cfc1a5d..c042d74 100644
--- a/src/totem-sidebar.c
+++ b/src/totem-sidebar.c
@@ -125,7 +125,7 @@ totem_sidebar_is_focused (Totem *totem, gboolean *handles_kbd)
 }
 
 void
-totem_sidebar_setup (Totem *totem, gboolean visible, const char *page_id)
+totem_sidebar_setup (Totem *totem, gboolean visible)
 {
 	GtkPaned *item;
 	GtkAction *action;
@@ -152,11 +152,6 @@ totem_sidebar_setup (Totem *totem, gboolean visible, const char *page_id)
 	gtk_widget_show_all (totem->sidebar);
 	gtk_widget_realize (totem->sidebar);
 
-	totem_sidebar_set_current_page (totem,
-					page_id ? page_id : "playlist",
-					visible);
-
-
 	if (!visible)
 		gtk_widget_hide (totem->sidebar);
 }
diff --git a/src/totem-sidebar.h b/src/totem-sidebar.h
index a89a9e6..9747c8c 100644
--- a/src/totem-sidebar.h
+++ b/src/totem-sidebar.h
@@ -26,8 +26,7 @@
 G_BEGIN_DECLS
 
 void totem_sidebar_setup (Totem *totem,
-			  gboolean visible,
-			  const char *page_id);
+			  gboolean visible);
 
 void totem_sidebar_toggle (Totem *totem, gboolean state);
 void totem_sidebar_set_visibility (Totem *totem, gboolean visible);