[nautilus-actions] Do not rewrite in GConf a just-readen sort order

[Pierre Wieser <pwieser src gnome org>]

commit 05c7cb7666b2729c3dd0107fe3f4f82f887b1091
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Apr 9 15:47:19 2010 +0200

    Do not rewrite in GConf a just-readen sort order
    
    This prevent to mark a newly created window as modified just because we have set
    a default sort order at runtime initialization.

 ChangeLog                    |    3 +++
 TODO                         |    3 ---
 src/nact/nact-sort-buttons.c |   12 +++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e430a9d..eb3bc57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-09 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/nact-sort-buttons.c (set_new_sort_order):
+	Do not rewrite in GConf a just-readen sort order.
+
 	* src/io-gconf/nagp-writer.c (nagp_iio_provider_delete_item):
 	Also delete the schema names which may be embedded in GConfEntry.
 
diff --git a/TODO b/TODO
index 3ad10cb..6a1a309 100644
--- a/TODO
+++ b/TODO
@@ -141,6 +141,3 @@
 - "x-nautilus-desktop:///" is rather a scheme than a folder
 
 - enhancement.ui: add a 'why this item is invalid' 
-
-- remove foo
-- bug when deleting last action
diff --git a/src/nact/nact-sort-buttons.c b/src/nact/nact-sort-buttons.c
index cb0a00a..9535840 100644
--- a/src/nact/nact-sort-buttons.c
+++ b/src/nact/nact-sort-buttons.c
@@ -38,6 +38,8 @@
 #include "nact-application.h"
 #include "nact-sort-buttons.h"
 
+static gboolean st_set_sort_order = FALSE;
+
 static void enable_buttons( NactMainWindow *window );
 static void on_sort_down_button_toggled( GtkToggleButton *button, NactMainWindow *window );
 static void on_sort_manual_button_toggled( GtkToggleButton *button, NactMainWindow *window );
@@ -121,6 +123,8 @@ nact_sort_buttons_all_widgets_showed( NactMainWindow *window )
 	updater = nact_application_get_updater( application );
 	order_mode = na_iprefs_get_order_mode( NA_IPREFS( updater ));
 	display_sort_order( window, order_mode );
+
+	st_set_sort_order = TRUE;
 }
 
 /**
@@ -277,9 +281,11 @@ set_new_sort_order( NactMainWindow *window, guint order_mode )
 	NactApplication *application;
 	NAUpdater *updater;
 
-	application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-	updater = nact_application_get_updater( application );
-	na_iprefs_set_order_mode( NA_IPREFS( updater ), order_mode );
+	if( st_set_sort_order ){
+		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
+		updater = nact_application_get_updater( application );
+		na_iprefs_set_order_mode( NA_IPREFS( updater ), order_mode );
+	}
 }
 
 static void