[glom] Dialog_ImportCSVProgress: rename a signal handler.

[Murray Cumming <murrayc src gnome org>]

commit 8e79edd3c47db67730ba7be8d5e000399a1fa7ae
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Mar 14 11:10:52 2012 +0100

    Dialog_ImportCSVProgress: rename a signal handler.
    
    	* glom/import_csv/dialog_import_csv_progress[h|cc]: Avoid a clash with
    	a virtual method of the same name in Gtk::Widget.

 ChangeLog                                     |    7 +++++++
 glom/import_csv/dialog_import_csv_progress.cc |    4 ++--
 glom/import_csv/dialog_import_csv_progress.h  |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a53cc92..d681b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-03-14  Murray Cumming  <murrayc murrayc com>
 
+	Dialog_ImportCSVProgress: rename a signal handler.
+
+	* glom/import_csv/dialog_import_csv_progress[h|cc]: Avoid a clash with 
+	a virtual method of the same name in Gtk::Widget.
+
+2012-03-14  Murray Cumming  <murrayc murrayc com>
+
 	Make sure that get_appwindow() overrides are const.
 
 	* glom/mode_data/buttonglom.[h|cc]:
diff --git a/glom/import_csv/dialog_import_csv_progress.cc b/glom/import_csv/dialog_import_csv_progress.cc
index 90ed8a2..896b836 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -83,7 +83,7 @@ void Dialog_Import_CSV_Progress::import(Dialog_Import_CSV& data_source)
     }
 
     m_progress_bar->set_text(Glib::ustring::compose(_("Parsing CSV file %1"), filename));
-    m_ready_connection = data_source.signal_state_changed().connect(sigc::mem_fun(*this, &Dialog_Import_CSV_Progress::on_state_changed));
+    m_ready_connection = data_source.signal_state_changed().connect(sigc::mem_fun(*this, &Dialog_Import_CSV_Progress::on_data_source_state_changed));
     break;
   }
   case CsvParser::STATE_PARSED:
@@ -123,7 +123,7 @@ void Dialog_Import_CSV_Progress::begin_import()
   m_progress_connection = Glib::signal_idle().connect(sigc::mem_fun(*this, &Dialog_Import_CSV_Progress::on_idle_import));
 }
 
-void Dialog_Import_CSV_Progress::on_state_changed()
+void Dialog_Import_CSV_Progress::on_data_source_state_changed()
 {
   switch(m_data_source->get_state())
   {
diff --git a/glom/import_csv/dialog_import_csv_progress.h b/glom/import_csv/dialog_import_csv_progress.h
index 127374d..69fddca 100644
--- a/glom/import_csv/dialog_import_csv_progress.h
+++ b/glom/import_csv/dialog_import_csv_progress.h
@@ -52,7 +52,7 @@ private:
 
   void begin_import();
 
-  void on_state_changed();
+  void on_data_source_state_changed();
   bool on_idle_import();
 
   virtual void on_response(int response_id); // Override from Gtk::Dialog