[glom/glom-1-18] Add and move #includes for the latest glibmm.

[Murray Cumming <murrayc src gnome org>]

commit 9f6f8ec017720cb56f99483c46fa65f014ef3f7e
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 26 23:04:00 2011 +0200

    Add and move #includes for the latest glibmm.
    
    	* glom/import_csv/csv_parser.cc:
    	* glom/import_csv/dialog_import_csv_progress.cc:
    	* glom/libglom/connectionpool.cc:
    	* glom/libglom/connectionpool_backends/postgres_self.cc:
    	* glom/libglom/privs.cc:
    	* glom/libglom/spawn_with_feedback.cc:
    	* glom/mode_data/box_data_list.cc:
    	* glom/mode_data/box_data_list_related.cc:
    	* glom/mode_data/db_adddel/db_adddel.cc:
    	* glom/mode_data/notebook_data.cc:
    	* glom/mode_design/print_layouts/window_print_layout_edit.h:
    	* glom/utility_widgets/dialog_image_load_progress.cc:
    	* glom/utility_widgets/dialog_image_save_progress.cc:
    	* glom/utils_ui.cc:
    	* tests/import/utils.cc: Add individual glibmm includes now that
    	gmmproc does not include glibmm.h from headers.
    	Always include glibmm/thread.h first to avoid deprecation warnings.
    
    Conflicts:
    
    	glom/utility_widgets/dialog_image_load_progress.cc
    	glom/utility_widgets/dialog_image_save_progress.cc
    	glom/utils_ui.cc

 ChangeLog                                          |   22 ++++++++++++++++++++
 glom/import_csv/csv_parser.cc                      |    1 +
 glom/import_csv/dialog_import_csv_progress.cc      |    1 +
 glom/libglom/connectionpool.cc                     |    2 +
 .../connectionpool_backends/postgres_self.cc       |    1 +
 glom/libglom/privs.cc                              |    1 +
 glom/libglom/spawn_with_feedback.cc                |    2 +-
 glom/mode_data/box_data_list.cc                    |    1 +
 glom/mode_data/box_data_list_related.cc            |    1 +
 glom/mode_data/notebook_data.cc                    |    1 +
 .../print_layouts/window_print_layout_edit.h       |    1 +
 glom/utility_widgets/db_adddel/db_adddel.cc        |    1 +
 glom/utils_ui.cc                                   |    1 +
 tests/import/utils.cc                              |    1 +
 14 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ee166a8..106e8a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-10-26  Murray Cumming  <murrayc murrayc com>
+
+	Add and move #includes for the latest glibmm. 
+
+	* glom/import_csv/csv_parser.cc:
+	* glom/import_csv/dialog_import_csv_progress.cc:
+	* glom/libglom/connectionpool.cc:
+	* glom/libglom/connectionpool_backends/postgres_self.cc:
+	* glom/libglom/privs.cc:
+	* glom/libglom/spawn_with_feedback.cc:
+	* glom/mode_data/box_data_list.cc:
+	* glom/mode_data/box_data_list_related.cc:
+	* glom/mode_data/db_adddel/db_adddel.cc:
+	* glom/mode_data/notebook_data.cc:
+	* glom/mode_design/print_layouts/window_print_layout_edit.h:
+	* glom/utility_widgets/dialog_image_load_progress.cc:
+	* glom/utility_widgets/dialog_image_save_progress.cc:
+	* glom/utils_ui.cc:
+	* tests/import/utils.cc: Add individual glibmm includes now that 
+	gmmproc does not include glibmm.h from headers.
+	Always include glibmm/thread.h first to avoid deprecation warnings.
+
 2011-10-25  Murray Cumming  <murrayc murrayc com>
 
 	Change #includes for the latest glibmm.
diff --git a/glom/import_csv/csv_parser.cc b/glom/import_csv/csv_parser.cc
index d5c796b..aa40ed6 100644
--- a/glom/import_csv/csv_parser.cc
+++ b/glom/import_csv/csv_parser.cc
@@ -21,6 +21,7 @@
 
 #include "csv_parser.h"
 #include <glibmm/convert.h>
+#include <glibmm/main.h>
 
 #include <cerrno>
 #include <iostream>
diff --git a/glom/import_csv/dialog_import_csv_progress.cc b/glom/import_csv/dialog_import_csv_progress.cc
index ae8ad11..63ccf45 100644
--- a/glom/import_csv/dialog_import_csv_progress.cc
+++ b/glom/import_csv/dialog_import_csv_progress.cc
@@ -25,6 +25,7 @@
 
 #include <libglom/data_structure/glomconversions.h>
 #include <glibmm/convert.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index 17b056e..afd9499 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -29,6 +29,8 @@
 #include <libglom/connectionpool_backends/postgres_self.h>
 # include <libglom/connectionpool_backends/sqlite.h>
 
+#include <glibmm/main.h>
+
 #ifdef G_OS_WIN32
 # include <windows.h>
 #else
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 42bb0f0..a23d352 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -28,6 +28,7 @@
 #include <glibmm/miscutils.h>
 #include <glibmm/stringutils.h>
 #include <glibmm/regex.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <libglom/gst-package.h>
diff --git a/glom/libglom/privs.cc b/glom/libglom/privs.cc
index 75942c5..48ff039 100644
--- a/glom/libglom/privs.cc
+++ b/glom/libglom/privs.cc
@@ -23,6 +23,7 @@
 #include <libglom/db_utils.h>
 #include <libglom/utils.h>
 //#include <glom/application.h>
+#include <glibmm/main.h>
 
 #include <iostream>
 
diff --git a/glom/libglom/spawn_with_feedback.cc b/glom/libglom/spawn_with_feedback.cc
index 475247d..7b8e86a 100644
--- a/glom/libglom/spawn_with_feedback.cc
+++ b/glom/libglom/spawn_with_feedback.cc
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <glibmm/thread.h>
 #include <libglom/spawn_with_feedback.h>
 #include <glibmm/main.h>
 #include <glibmm/spawn.h>
-#include <glibmm/thread.h>
 #include <glibmm/iochannel.h>
 #include <glibmm/shell.h>
 #include <glibmm/fileutils.h>
diff --git a/glom/mode_data/box_data_list.cc b/glom/mode_data/box_data_list.cc
index c781bf9..1df98ad 100644
--- a/glom/mode_data/box_data_list.cc
+++ b/glom/mode_data/box_data_list.cc
@@ -28,6 +28,7 @@
 #include <libglom/utils.h> //For bold_message()).
 //#include <../utility_widgets/db_adddel/glom_db_treemodel.h> //For DbTreeModel.
 #include <sstream> //For stringstream
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index c94a9de..01cc429 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -25,6 +25,7 @@
 #include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <glom/utils_ui.h> //For bold_message()).
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 namespace Glom
diff --git a/glom/mode_data/notebook_data.cc b/glom/mode_data/notebook_data.cc
index 0d1fd6d..6b7cb8a 100644
--- a/glom/mode_data/notebook_data.cc
+++ b/glom/mode_data/notebook_data.cc
@@ -20,6 +20,7 @@
 
 #include <glom/mode_data/notebook_data.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.h b/glom/mode_design/print_layouts/window_print_layout_edit.h
index da5cb73..c38f732 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -35,6 +35,7 @@
 #include <glom/utility_widgets/gimpruler/gimpruler.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/spinbutton.h>
+#include <gtkmm/button.h>
 #include <gtkmm/builder.h>
 
 namespace Glom
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index 6752d02..b799d57 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -32,6 +32,7 @@
 #include <glom/utils_ui.h> //For Utils::image_scale_keeping_ratio().
 #include <glom/mode_data/datawidget/cellcreation.h>
 #include <gtkmm/stock.h>
+#include <glibmm/main.h>
 #include <libglom/db_utils.h>
 
 #include <iostream> //For debug output.
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 70b22bb..a6fe9f6 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -41,6 +41,7 @@
 #include <hildonmm/note.h>
 #endif
 
+#include <glibmm/main.h>
 #include <glibmm/i18n.h>
 
 #include <string.h> // for strchr
diff --git a/tests/import/utils.cc b/tests/import/utils.cc
index 338d6b7..ff5bc30 100644
--- a/tests/import/utils.cc
+++ b/tests/import/utils.cc
@@ -1,6 +1,7 @@
 #include <tests/import/utils.h>
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/main.h>
 
 namespace ImportTests
 {