[gthumb] rename_series: keep the cancel button sensitive during file loading

[Paolo Bacchilega <paobac src gnome org>]

commit 1c9d770f5c737e790a93404229cf00c3e9141377
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Apr 4 15:28:01 2011 +0200

    rename_series: keep the cancel button sensitive during file loading

 extensions/rename_series/data/ui/rename-series.ui |    4 ++--
 extensions/rename_series/dlg-rename-series.c      |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/extensions/rename_series/data/ui/rename-series.ui b/extensions/rename_series/data/ui/rename-series.ui
index 11edf0a..61100c1 100644
--- a/extensions/rename_series/data/ui/rename-series.ui
+++ b/extensions/rename_series/data/ui/rename-series.ui
@@ -17,7 +17,7 @@
             <property name="border_width">6</property>
             <property name="spacing">12</property>
             <child>
-              <object class="GtkTable" id="table1">
+              <object class="GtkTable" id="options_table">
                 <property name="visible">True</property>
                 <property name="n_rows">4</property>
                 <property name="n_columns">2</property>
@@ -605,8 +605,8 @@
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">vertical</property>
     <widgets>
-      <widget name="template_entry"/>
       <widget name="template_label_box"/>
+      <widget name="template_entry"/>
     </widgets>
   </object>
   <object class="GtkAdjustment" id="start_at_adjustment">
diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c
index 817efc3..fcfc22d 100644
--- a/extensions/rename_series/dlg-rename-series.c
+++ b/extensions/rename_series/dlg-rename-series.c
@@ -405,7 +405,6 @@ get_required_attributes (DialogData *data)
 		g_string_append (required_attributes, G_FILE_ATTRIBUTE_TIME_MODIFIED "," G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC);
 	}
 
-
 	return g_string_free (required_attributes, FALSE);
 }
 
@@ -421,6 +420,8 @@ load_file_data_task_completed_cb (GthTask  *task,
 	DialogData *data = user_data;
 
 	gtk_widget_hide (GET_WIDGET ("task_box"));
+	gtk_widget_set_sensitive (GET_WIDGET ("options_table"), TRUE);
+	gtk_widget_set_sensitive (GET_WIDGET ("ok_button"), TRUE);
 
 	if (error != NULL) {
 		/* FIXME _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Cannot read file information"), &error); */
@@ -439,7 +440,6 @@ load_file_data_task_completed_cb (GthTask  *task,
 	data->task_completed_id = 0;
 	data->template_changed = FALSE;
 
-	gtk_widget_set_sensitive (data->dialog, TRUE);
 	gtk_window_present (GTK_WINDOW (data->dialog));
 	gtk_widget_grab_focus (GET_WIDGET ("template_entry"));
 	dlg_rename_series_update_preview (data);
@@ -471,8 +471,8 @@ dlg_rename_series_update_preview (DialogData *data)
 		if (reload_required) {
 			GtkWidget *child;
 
-			/* FIXME gtk_widget_set_sensitive (data->dialog, FALSE); */
-
+			gtk_widget_set_sensitive (GET_WIDGET ("options_table"), FALSE);
+			gtk_widget_set_sensitive (GET_WIDGET ("ok_button"), FALSE);
 			gtk_widget_show (GET_WIDGET ("task_box"));
 
 			data->task = gth_load_file_data_task_new (data->file_list, data->required_attributes);