[totem/gnome-2-28] On restore, prefer session position to file one

[Bastien Nocera <hadess src gnome org>]

commit bafe715773b581d6fd0f95391a350bb9c4247bc8
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 8 11:39:21 2010 +0100

    On restore, prefer session position to file one
    
    When restoring the session, we would get both the session saved
    position, and the one saved as metadata to the file. We should
    only take the session position into account, in preference to
    the one saved on disk.

 src/totem-object.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 3aa7daa..d4c7bd0 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -2487,14 +2487,13 @@ update_seekable (Totem *totem)
 	/* This is for the session restore and the position saving
 	 * to seek to the saved time */
 	if (seekable != FALSE) {
-		if (totem->seek_to != 0) {
-			bacon_video_widget_seek_time (totem->bvw,
-						      totem->seek_to, NULL);
-		}
 		if (totem->seek_to_start != 0) {
 			bacon_video_widget_seek_time (totem->bvw,
 						      totem->seek_to_start, NULL);
 			totem_action_pause (totem);
+		} else if (totem->seek_to != 0) {
+			bacon_video_widget_seek_time (totem->bvw,
+						      totem->seek_to, NULL);
 		}
 	}
 	totem->seek_to = 0;