[gnumeric] GUI: Improve fix for saved-pristine-file.

[Morten Welinder <mortenw src gnome org>]

commit fd51d4040ebc11f91016d235f690d5bbc5757607
Author: Morten Welinder <terra gnome org>
Date:   Fri Nov 19 16:01:29 2010 -0500

    GUI: Improve fix for saved-pristine-file.

 ChangeLog           |   11 ++++++++---
 src/gui-file.c      |    6 +-----
 src/workbook-view.c |    5 ++++-
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5b12e10..c374c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-19  Morten Welinder  <terra gnome org>
+
+	* src/workbook-view.c (wb_view_save_as): Better fix for 634792.
+
 2010-11-16  Morten Welinder  <terra gnome org>
 
 	* src/*.c: Constify GOFormat handling.
@@ -14,12 +18,13 @@
 
 2010-11-07  Jean Brefort  <jean brefort normalesup org>
 
-	* src/sheet-object-image.c (so_image_view_set_bounds): fixed image bounds
-	in zoomed sheets.
+	* src/sheet-object-image.c (so_image_view_set_bounds): fixed image
+	bounds in zoomed sheets.
 
 2010-11-06  Jean Brefort  <jean brefort normalesup org>
 
-	* src/dead-kittens.h: fixed property name in gtk_table_get_size(). [#634149]
+	* src/dead-kittens.h: fixed property name in
+	gtk_table_get_size. [#634149]
 
 2010-11-05   Andreas J. Guelzow <aguelzow pyrshep ca>
 	for Sameer Morar <smorar gmail com>
diff --git a/src/gui-file.c b/src/gui-file.c
index a044b2a..16632dd 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -577,8 +577,6 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view)
 			if (wbcg2)
 				wbcg2->current_saver = fs;
 			workbook_update_history (wb);
-			/* See 634792.  */
-			go_doc_set_pristine (GO_DOC (wb), FALSE);
 		}
 	}
 
@@ -617,10 +615,8 @@ gui_file_save (WBCGtk *wbcg, WorkbookView *wb_view)
 		g_object_ref (wb);
 
 		ok = wb_view_save (wb_view, GO_CMD_CONTEXT (wbcg));
-		if (ok) {
+		if (ok)
 			workbook_update_history (wb);
-			go_doc_set_pristine (GO_DOC (wb), FALSE);
-		}
 		g_object_unref (wb);
 		return ok;
 	}
diff --git a/src/workbook-view.c b/src/workbook-view.c
index fc664fa..089e4b6 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -1128,8 +1128,11 @@ wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
 	if (!has_error) {
 		if (workbook_set_saveinfo (wb,
 			go_file_saver_get_format_level (fs), fs) &&
-		    go_doc_set_uri (GO_DOC (wb), uri))
+		    go_doc_set_uri (GO_DOC (wb), uri)) {
 			go_doc_set_dirty (GO_DOC (wb), FALSE);
+			/* See 634792.  */
+			go_doc_set_pristine (GO_DOC (wb), FALSE);
+		}
 	}
 	if (has_error || has_warning)
 		go_io_error_display (io_context);