[nautilus/merge_replace_dialog] Focus and sensitivity fixes.

[Cosimo Cecchi <cosimoc src gnome org>]

commit bd84cd490212f9a3d500af403490a77b19ab7557
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Apr 9 11:27:23 2010 +0200

    Focus and sensitivity fixes.

 .../nautilus-file-conflict-dialog.c                |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index f4c5ac4..65d6fd7 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -331,9 +331,19 @@ entry_text_changed_cb (GtkEditable *entry,
 	     g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), details->conflict_name) != 0) {
 		gtk_widget_hide (details->replace_button);
 		gtk_widget_show (details->rename_button);
+
+		gtk_widget_set_sensitive (details->checkbox, FALSE);
+
+		gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+						 CONFLICT_RESPONSE_RENAME);
 	} else {
 		gtk_widget_hide (details->rename_button);
 		gtk_widget_show (details->replace_button);
+
+		gtk_widget_set_sensitive (details->checkbox, TRUE);
+
+		gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+						 CONFLICT_RESPONSE_REPLACE);
 	}
 }
 
@@ -347,10 +357,10 @@ expander_activated_cb (GtkExpander *w,
 	details = dialog->details;
 
 	if (!gtk_expander_get_expanded (w)) {
-		gtk_widget_grab_focus (details->entry);
-
 		if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (details->entry)),
 			       details->conflict_name) == 0) {
+			gtk_widget_grab_focus (details->entry);
+
 			eel_filename_get_rename_region (details->conflict_name,
 							&start_pos, &end_pos);
 			gtk_editable_select_region (GTK_EDITABLE (details->entry),
@@ -502,6 +512,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 		gtk_dialog_add_button (dialog,
 				       _("Replace"),
 				       CONFLICT_RESPONSE_REPLACE);
+	gtk_widget_grab_focus (details->replace_button);
 
 	/* Setup HIG properties */
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);