[gnumeric] Fix button sensitivity in sort dialog.

[Andreas J. Guelzow <guelzow src gnome org>]

commit c2e05644e984a0a6d627c3b15babe17bf079b0e3
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Aug 27 00:58:27 2010 -0600

    Fix button sensitivity in sort dialog.
    
    2010-08-27  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* dialog-cell-sort.c (set_ok_button_sensitivity): renamed to
    	  set_button_sensitivity and change all callers. Also handle
    	  clear button
    	(cb_update_to_new_range): always use set_button_sensitivity

 NEWS                           |    1 +
 src/dialogs/ChangeLog          |    7 +++++++
 src/dialogs/dialog-cell-sort.c |   22 ++++++++++------------
 3 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/NEWS b/NEWS
index 9187289..6c6fee4 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Andreas:
 	* Fix INTERPOLATION documentation. [#627461]
 	* Provide progress info in ODF export.
 	* Improve warnings dialog in ODF import.
+	* Fix button sensitivity in sort dialog.
 
 Jean:
 	* Fix some interpolation and periodogram issues.
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 2bf6091..344ffe2 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-27  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* dialog-cell-sort.c (set_ok_button_sensitivity): renamed to
+	  set_button_sensitivity and change all callers. Also handle
+	  clear button
+	(cb_update_to_new_range): always use set_button_sensitivity
+
 2010-08-16  Morten Welinder <terra gnome org>
 
 	* Release 1.10.9
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index e3a69f8..61c6970 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -209,7 +209,7 @@ cb_sort_field_menu_activate(GtkWidget *item, AddSortFieldMenuState *menu_state)
 }
 
 static void
-set_ok_button_sensitivity(SortFlowState *state)
+set_button_sensitivity(SortFlowState *state)
 {
 	int items;
 
@@ -227,6 +227,7 @@ set_ok_button_sensitivity(SortFlowState *state)
 	gtk_widget_set_sensitive (state->ok_button,
 				  (state->sort_items != 0) &&
 				  (items > 1));
+	gtk_widget_set_sensitive (state->clear_button, state->sort_items != 0);
 }
 
 static void
@@ -268,7 +269,7 @@ cb_sort_field_selection(GtkWidget *item, AddSortFieldMenuState *menu_state)
 		    menu_state->index);
 	/* Update sensitivity if this is the first sort item. */
 	if (menu_state->state->sort_items == 1)
-		set_ok_button_sensitivity(menu_state->state);
+		set_button_sensitivity(menu_state->state);
 }
 
 static void
@@ -407,7 +408,7 @@ cb_sort_header_check(SortFlowState *state)
 		GTK_TOGGLE_BUTTON (state->cell_sort_header_check));
 
 	gtk_tree_view_column_set_visible (state->header_column, state->header);
-	set_ok_button_sensitivity (state);
+	set_button_sensitivity (state);
 }
 
 static void
@@ -424,13 +425,9 @@ cb_update_to_new_range (SortFlowState *state)
 			gtk_list_store_clear (state->model);
 			state->sort_items = 0;
 		}
-		gtk_widget_set_sensitive (state->ok_button, FALSE);
-	} else {
+	} else
 		translate_range (range, state);
-		set_ok_button_sensitivity(state);
-	}
-
-	gtk_widget_set_sensitive (state->clear_button, state->sort_items != 0);
+	set_button_sensitivity(state);
 }
 
 static void
@@ -645,6 +642,7 @@ cb_sort_selection_changed (SortFlowState *state)
 					   &test));
 
 	gtk_widget_set_sensitive (state->delete_button, TRUE);
+	set_button_sensitivity (state);
 }
 
 static void
@@ -718,7 +716,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkWidget *w, SortFlowState *state)
 
 	gtk_list_store_remove (state->model, &iter);
 	state->sort_items--;
-	set_ok_button_sensitivity (state);
+	set_button_sensitivity (state);
 }
 
 
@@ -727,7 +725,7 @@ cb_clear_clicked (SortFlowState *state)
 {
 	state->sort_items = 0;
 	gtk_list_store_clear (state->model);
-	set_ok_button_sensitivity (state);
+	set_button_sensitivity (state);
 }
 
 static GtkMenu *
@@ -841,7 +839,7 @@ cb_add_clicked (SortFlowState *state)
 			}
 		}
 		if (!had_items && (state->sort_items > 0))
-			set_ok_button_sensitivity(state);
+			set_button_sensitivity(state);
 	} else
 		show_add_menu (state);
 	gnm_expr_entry_load_from_text (GNM_EXPR_ENTRY (state->add_entry), "");