Index: data/totem.glade
===================================================================
RCS file: /cvs/gnome/totem/data/totem.glade,v
retrieving revision 1.114
diff -u -p -r1.114 totem.glade
--- data/totem.glade	21 Jan 2006 22:10:57 -0000	1.114
+++ data/totem.glade	10 Feb 2006 23:27:12 -0000
@@ -1933,20 +1933,6 @@ AC3 Passthrough</property>
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="tmw_menu_movie_separator_2">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="tmw_properties_menu_item">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
-		      <signal name="activate" handler="on_properties1_activate" last_modification_time="Fri, 07 Feb 2003 20:29:18 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="tmw_menu_recent_separator">
 		      <property name="visible">True</property>
 		    </widget>
Index: src/totem-sidebar.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-sidebar.c,v
retrieving revision 1.5
diff -u -p -r1.5 totem-sidebar.c
--- src/totem-sidebar.c	18 Dec 2005 13:27:29 -0000	1.5
+++ src/totem-sidebar.c	10 Feb 2006 23:27:13 -0000
@@ -130,6 +130,9 @@ totem_sidebar_setup (Totem *totem)
 	ev_sidebar_add_page (EV_SIDEBAR (totem->sidebar),
 			"playlist", _("Playlist"),
 			GTK_WIDGET (totem->playlist));
+	ev_sidebar_add_page (EV_SIDEBAR (totem->sidebar),
+			"properties", _("Properties"),
+			GTK_WIDGET (totem->properties));
 	gtk_paned_pack2 (GTK_PANED (item), totem->sidebar, TRUE, FALSE);
 
 	visible = gconf_client_get_bool (totem->gc,
Index: src/totem.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem.c,v
retrieving revision 1.485
diff -u -p -r1.485 totem.c
--- src/totem.c	9 Feb 2006 15:07:42 -0000	1.485
+++ src/totem.c	10 Feb 2006 23:27:17 -0000
@@ -834,8 +834,6 @@ totem_action_set_mrl_with_warning (Totem
 	update_buttons (totem);
 	update_media_menu_items (totem);
 
-	totem_main_set_sensitivity ("tmw_properties_menu_item", retval);
-
 	return retval;
 }
 
@@ -2016,46 +2014,6 @@ on_take_screenshot1_activate (GtkButton 
 }
 
 static void
-hide_props_dialog (GtkWidget *widget, int trash, gpointer user_data)
-{
-	gtk_widget_hide (widget);
-}
-
-static void
-on_properties1_activate (GtkButton *button, Totem *totem)
-{
-	static GtkWidget *dialog;
-
-	if (totem->properties == NULL)
-	{
-		totem_action_error (_("Totem couldn't show the movie properties window."), _("Make sure that Totem is correctly installed."), totem);
-		return;
-	}
-
-	if (dialog != NULL)
-	{
-		gtk_widget_show (dialog);
-		return;
-	}
-
-	dialog = gtk_dialog_new_with_buttons (_("Properties"),
-			GTK_WINDOW (totem->win),
-			GTK_DIALOG_DESTROY_WITH_PARENT
-			| GTK_DIALOG_NO_SEPARATOR,
-			GTK_STOCK_CLOSE,
-			GTK_RESPONSE_ACCEPT,
-			NULL);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			totem->properties, TRUE, TRUE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-	g_signal_connect (G_OBJECT (dialog), "response",
-			G_CALLBACK (hide_props_dialog), NULL);
-	g_signal_connect (G_OBJECT (dialog), "delete-event",
-			G_CALLBACK (hide_props_dialog), NULL);
-	gtk_widget_show (dialog);
-}
-
-static void
 on_preferences1_activate (GtkButton *button, Totem *totem)
 {
 	gtk_widget_show (totem->prefs);
@@ -3061,9 +3019,6 @@ totem_callback_connect (Totem *totem)
 	item = glade_xml_get_widget (totem->xml, "tmw_preferences_menu_item");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_preferences1_activate), totem);
-	item = glade_xml_get_widget (totem->xml, "tmw_properties_menu_item");
-	g_signal_connect (G_OBJECT (item), "activate",
-			G_CALLBACK (on_properties1_activate), totem);
 	item = glade_xml_get_widget (totem->xml, "tmw_volume_up_menu_item");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_volume_up1_activate), totem);
@@ -3544,6 +3499,7 @@ main (int argc, char **argv)
 
 	/* The sidebar */
 	playlist_widget_setup (totem);
+	totem->properties = bacon_video_widget_properties_new ();
 	totem_sidebar_setup (totem);
 
 	/* The rest of the widgets */
@@ -3574,9 +3530,6 @@ main (int argc, char **argv)
 	totem->tcw_time_label = glade_xml_get_widget (totem->xml,
 			"tcw_time_display_label");
 	totem->seek_lock = totem->vol_lock = totem->vol_fs_lock = FALSE;
-
-	/* Properties */
-	totem->properties = bacon_video_widget_properties_new ();
 
 	totem_session_setup (totem, argv);
 	totem_setup_recent (totem);
Index: src/backend/bacon-video-widget-xine.c
===================================================================
RCS file: /cvs/gnome/totem/src/backend/bacon-video-widget-xine.c,v
retrieving revision 1.225
diff -u -p -r1.225 bacon-video-widget-xine.c
--- src/backend/bacon-video-widget-xine.c	3 Feb 2006 14:27:56 -0000	1.225
+++ src/backend/bacon-video-widget-xine.c	10 Feb 2006 23:27:20 -0000
@@ -3483,12 +3483,14 @@ bacon_video_widget_get_metadata_bool (Ba
 	switch (type)
 	{
 	case BVW_INFO_HAS_VIDEO:
-		boolean = xine_get_stream_info (bvw->priv->stream,
-				XINE_STREAM_INFO_HAS_VIDEO);
+		if (bvw->priv->logo_mode != FALSE)
+			boolean = xine_get_stream_info (bvw->priv->stream,
+					XINE_STREAM_INFO_HAS_VIDEO);
 		break;
 	case BVW_INFO_HAS_AUDIO:
-		boolean = xine_get_stream_info (bvw->priv->stream,
-				XINE_STREAM_INFO_HAS_AUDIO);
+		if (bvw->priv->logo_mode != FALSE)
+			boolean = xine_get_stream_info (bvw->priv->stream,
+					XINE_STREAM_INFO_HAS_AUDIO);
 		break;
 	default:
 		g_assert_not_reached ();
