[glom] PrintOperation_PrintLayout: Move to print_layout/:

[Murray Cumming <murrayc src gnome org>]

commit 657764890f7ddb90e30b6762ab14e21edbce47b5
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 4 10:53:53 2011 +0200

    PrintOperation_PrintLayout: Move to print_layout/:
    
    * Makefile_glom.am:  Mention the changed paths.
    * glom/frame_glom.cc: Adapted.

 ChangeLog                          |    7 +++
 Makefile_glom.am                   |    4 +-
 glom/frame_glom.cc                 |    5 +-
 glom/printoperation_printlayout.cc |  100 ------------------------------------
 glom/printoperation_printlayout.h  |   52 -------------------
 5 files changed, 11 insertions(+), 157 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e0f7b03..aa95ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-10-04  Murray Cumming  <murrayc murrayc com>
 
+	PrintOperation_PrintLayout: Move to print_layout/:
+	
+	* Makefile_glom.am:  Mention the changed paths.
+	* glom/frame_glom.cc: Adapted.
+
+2011-10-04  Murray Cumming  <murrayc murrayc com>
+
 	PrintLayoutUtils: Move to print_layout/
 
 	* Makefile_glom.am: Mention the changed paths.
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 7d7fbe4..83dfba0 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -106,8 +106,6 @@ glom_source_files = \
 	glom/variablesmap.h						\
 	glom/xsl_utils.cc						\
 	glom/xsl_utils.h						\
-	glom/printoperation_printlayout.cc				\
-	glom/printoperation_printlayout.h				\
 	glom/report_builder.cc						\
 	glom/report_builder.h						\
 	glom/window_boxholder.cc					\
@@ -204,6 +202,8 @@ glom_source_files = \
 	glom/print_layout/canvas_print_layout.h				\
 	glom/print_layout/print_layout_utils.cc \
 	glom/print_layout/print_layout_utils.h \				\
+	glom/print_layout/printoperation_printlayout.cc				\
+	glom/print_layout/printoperation_printlayout.h				\
 	glom/python_embed/glom_python.cc				\
 	glom/python_embed/glom_python.h					\
 	glom/python_embed/python_ui_callbacks.cc				\
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 9222ff3..84ec909 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -56,7 +56,7 @@
 #ifndef GLOM_ENABLE_CLIENT_ONLY
 #include <glom/mode_design/dialog_add_related_table.h>
 #include <glom/mode_design/script_library/dialog_script_library.h>
-#include <glom/printoperation_printlayout.h>
+#include <glom/print_layout/printoperation_printlayout.h>
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
 #include <glom/filechooser_export.h>
@@ -2371,8 +2371,7 @@ void Frame_Glom::do_print_layout(const sharedptr<const PrintLayout>& print_layou
   {
     Glib::KeyFile key_file;
     key_file.load_from_data(key_file_text);
-    //TODO: Use this when gtkmm and GTK+ have been fixed: page_setup = Gtk::PageSetup::create(key_file);
-    page_setup = Glib::wrap(gtk_page_setup_new_from_key_file(key_file.gobj(), 0, 0));
+    page_setup = Gtk::PageSetup::create_from_key_file(key_file);
   }
 
   print->set_default_page_setup(page_setup);