glom r2032 - in trunk: . glom glom/layout_item_dialogs glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/data_structure/layout glom/libglom/data_structure/layout/report_parts glom/libglom/document glom/libglom/document/bakery glom/libglom/document/bakery/view glom/libglom/python_embed glom/mode_data glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/reports glom/translation glom/utility_widgets

From: murrayc svn gnome org
To: svn-commits-list gnome org
Subject: glom r2032 - in trunk: . glom glom/layout_item_dialogs glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/data_structure/layout glom/libglom/data_structure/layout/report_parts glom/libglom/document glom/libglom/document/bakery glom/libglom/document/bakery/view glom/libglom/python_embed glom/mode_data glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/reports glom/translation glom/utility_widgets
Date: Fri, 27 Mar 2009 10:47:21 +0000 (UTC)
Author: murrayc
Date: Fri Mar 27 10:47:21 2009
New Revision: 2032
URL: http://svn.gnome.org/viewvc/glom?rev=2032&view=rev

Log:
2009-03-27  Murray Cumming  <murrayc murrayc com>

* configure.ac, glom/libglom/*/Makefile.am: Do two separate 
PKG_CONFIG_MODULE() checks for Glom and libglom to avoid unnecessary 
dependencies in libglom.
* Moved libglom/glade_utils.h to glom/libglom/glade_utils.h.
* *.[h|cc]: Some incomplete improvement of includes, to use full paths, to 
  make search/replace refactoring easier.

Added:
   trunk/glom/glade_utils.h   (props changed)
      - copied unchanged from r2030, /trunk/glom/libglom/glade_utils.h
Removed:
   trunk/glom/libglom/glade_utils.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/glom/Makefile.am
   trunk/glom/application.cc
   trunk/glom/base_db.cc
   trunk/glom/dialog_invalid_data.cc
   trunk/glom/filechooser_export.cc
   trunk/glom/frame_glom.cc
   trunk/glom/layout_item_dialogs/dialog_field_layout.cc
   trunk/glom/layout_item_dialogs/dialog_group_by.cc
   trunk/glom/libglom/Makefile.am
   trunk/glom/libglom/connectionpool_backends/Makefile.am
   trunk/glom/libglom/connectionpool_backends/postgres_self.cc
   trunk/glom/libglom/data_structure/Makefile.am
   trunk/glom/libglom/data_structure/layout/Makefile.am
   trunk/glom/libglom/data_structure/layout/custom_title.h
   trunk/glom/libglom/data_structure/layout/fieldformatting.h
   trunk/glom/libglom/data_structure/layout/layoutitem.h
   trunk/glom/libglom/data_structure/layout/layoutitem_field.h
   trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h
   trunk/glom/libglom/data_structure/layout/layoutitem_portal.h
   trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
   trunk/glom/libglom/data_structure/layout/usesrelationship.h
   trunk/glom/libglom/document/Makefile.am
   trunk/glom/libglom/document/bakery/Makefile.am
   trunk/glom/libglom/document/bakery/view/Makefile.am
   trunk/glom/libglom/document/document_glom.h
   trunk/glom/libglom/python_embed/Makefile.am
   trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc
   trunk/glom/libglom/spawn_with_feedback.cc
   trunk/glom/main.cc
   trunk/glom/mode_data/box_data_details.cc
   trunk/glom/mode_data/box_data_details.h
   trunk/glom/mode_data/box_data_list.cc
   trunk/glom/mode_data/box_data_list_related.cc
   trunk/glom/mode_data/box_data_manyrecords.cc
   trunk/glom/mode_data/box_data_portal.cc
   trunk/glom/mode_data/dialog_layout_details.cc
   trunk/glom/mode_data/flowtablewithfields.cc
   trunk/glom/mode_data/flowtablewithfields.h
   trunk/glom/mode_design/fields/box_db_table_definition.cc
   trunk/glom/mode_design/fields/dialog_fielddefinition.cc
   trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
   trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc
   trunk/glom/mode_design/script_library/dialog_script_library.cc
   trunk/glom/mode_design/users/dialog_groups_list.cc
   trunk/glom/mode_design/users/dialog_users_list.cc
   trunk/glom/reports/dialog_layout_report.cc
   trunk/glom/translation/window_translations.cc
   trunk/glom/utility_widgets/buttonglom.cc
   trunk/glom/utility_widgets/checkglom.cc
   trunk/glom/utility_widgets/comboentryglom.cc
   trunk/glom/utility_widgets/comboglom.cc
   trunk/glom/utility_widgets/datawidget.cc
   trunk/glom/utility_widgets/entryglom.cc
   trunk/glom/utility_widgets/imageglom.cc
   trunk/glom/utility_widgets/labelglom.cc
   trunk/glom/utility_widgets/layoutwidgetbase.cc
   trunk/glom/utility_widgets/layoutwidgetmenu.cc
   trunk/glom/utility_widgets/notebookglom.cc
   trunk/glom/utility_widgets/notebooklabelglom.cc
   trunk/glom/utility_widgets/placeholder-glom.cc
   trunk/glom/utility_widgets/textviewglom.cc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar 27 10:47:21 2009
@@ -104,32 +104,54 @@
 	AC_DEFINE([GLOM_ENABLE_POSTGRESQL], 1, [Whether to enable support for PostgreSQL databases.])
 fi
 
+# Libraries used by libglom:
+REQUIRED_LIBGLOM_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 libxml++-2.6 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.14 libgda-4.0 >= 4.0.0 libgda-postgres-4.0"
 
+if test "$enable_maemo" = "yes"; then
+	REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS ibepc-1.0 >= 0.3.1 avahi-ui";
+elif test "$win32" = "true"; then
+	REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS";
+else
+	REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS iso-codes libepc-1.0 >= 0.3.1 avahi-ui";
+fi
+
+
+# Libraries used by Glom:
+REQUIRED_GLOM_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.14 libgda-4.0 >= 4.0.0 libgda-postgres-4.0 goocanvasmm-1.0 >= 0.14.0"
+
+REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS $REQUIRED_LIBGLOM_LIBS"
+	
 # Do not require, goocanvas and gtksourceviewmm in client only mode
-REQUIRED_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.14 libgda-4.0 >= 4.0.0 libgda-postgres-4.0 goocanvasmm-1.0 >= 0.14.0"
 if test $enable_client_only != yes; then
-	REQUIRED_LIBS="$REQUIRED_LIBS gtksourceviewmm-2.0"
+	REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS gtksourceviewmm-2.0"
 fi
 
+
 if test "$enable_maemo" = "yes"; then
-	REQUIRED_LIBS="$REQUIRED_LIBS hildonmm libepc-1.0 >= 0.3.1 avahi-ui";
+	REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS hildonmm";
 elif test "$win32" = "true"; then
-	REQUIRED_LIBS="$REQUIRED_LIBS gtkmm-2.4 >= 2.14";
+	REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS gtkmm-2.4 >= 2.14";
 else
-	REQUIRED_LIBS="$REQUIRED_LIBS iso-codes libepc-1.0 >= 0.3.1 avahi-ui";
+	REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS";
 fi
 
 if test "$enable_sqlite" = "yes"; then
-	REQUIRED_LIBS="$REQUIRED_LIBS libgda-sqlite-4.0"
+	REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS libgda-sqlite-4.0"
 fi
 
-# Checks for libraries
-PKG_CHECK_MODULES(GLOM, $REQUIRED_LIBS)
-
+# Checks for libraries.
+PKG_CHECK_MODULES(GLOM, $REQUIRED_GLOM_LIBS)
 GLOM_LIBS="$GLOM_LIBS --no-undefined"
 AC_SUBST(GLOM_CFLAGS)
 AC_SUBST(GLOM_LIBS)
 
+PKG_CHECK_MODULES(LIBGLOM, $REQUIRED_LIBGLOM_LIBS)
+LIBGLOM_LIBS="$GLOM_LIBS --no-undefined"
+AC_SUBST(LIBGLOM_CFLAGS)
+AC_SUBST(LIBGLOM_LIBS)
+
+
+
 # Temporary egg CFLAGS
 PKG_CHECK_MODULES(EGG, gtk+-2.0 >= 2.5.0)
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`

Modified: trunk/glom/Makefile.am
==============================================================================
--- trunk/glom/Makefile.am	(original)
+++ trunk/glom/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -51,7 +51,7 @@
                box_reports.h box_reports.cc \
                xsl_utils.h xsl_utils.cc \
                variablesmap.h variablesmap.cc \
-               signal_reemitter.h
+               signal_reemitter.h glade_utils.h
 
 if !GLOM_ENABLE_CLIENT_ONLY
 glom_SOURCES += dialog_new_self_hosted_connection.h \

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Fri Mar 27 10:47:21 2009
@@ -32,7 +32,7 @@
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 
 //#include <libglom/connectionpool_backends/postgres_central.h>
 //#include <libglom/connectionpool_backends/postgres_self.h>

Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc	(original)
+++ trunk/glom/base_db.cc	Fri Mar 27 10:47:21 2009
@@ -37,7 +37,7 @@
 
 //#include "reports/dialog_layout_report.h"
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/data_structure/parameternamegenerator.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>

Modified: trunk/glom/dialog_invalid_data.cc
==============================================================================
--- trunk/glom/dialog_invalid_data.cc	(original)
+++ trunk/glom/dialog_invalid_data.cc	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #include "dialog_invalid_data.h"
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 
 namespace Glom
 {

Modified: trunk/glom/filechooser_export.cc
==============================================================================
--- trunk/glom/filechooser_export.cc	(original)
+++ trunk/glom/filechooser_export.cc	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #include "filechooser_export.h"
 #include "mode_data/dialog_layout_export.h"
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
 

Modified: trunk/glom/frame_glom.cc
==============================================================================
--- trunk/glom/frame_glom.cc	(original)
+++ trunk/glom/frame_glom.cc	Fri Mar 27 10:47:21 2009
@@ -49,7 +49,7 @@
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <libglom/data_structure/glomconversions.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>

Modified: trunk/glom/layout_item_dialogs/dialog_field_layout.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_layout.cc	(original)
+++ trunk/glom/layout_item_dialogs/dialog_field_layout.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "dialog_field_layout.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/layout_item_dialogs/dialog_group_by.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.cc	(original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "dialog_group_by.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <sstream> //For stringstream
 #include <glibmm/i18n.h>
 

Modified: trunk/glom/libglom/Makefile.am
==============================================================================
--- trunk/glom/libglom/Makefile.am	(original)
+++ trunk/glom/libglom/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -7,7 +7,7 @@
 
 # We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
 # We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS) $(PYTHON_INCLUDES) \
            -DGLOM_GLADEDIR=\""$(gladedir)/"\" \
            -DLOCALEDIR=\""$(datadir)/locale"\" \
            -DPREFIX=\""$(prefix)"\" \
@@ -31,7 +31,7 @@
                      connectionpool.h \
                      dialog_progress_creating.h \
                      spawn_with_feedback.h \
-                     utils.h glade_utils.h \
+                     utils.h \
                      gst-package.h
 
 cc_sources = appstate.cc \
@@ -64,7 +64,7 @@
                      data_structure/layout/libdata_structure_layout.la \
                      data_structure/layout/report_parts/libdata_structure_layout_reportparts.la \
                      python_embed/libglom_python_embed.la \
-                     $(GLOM_LIBS) $(PYTHON_LDFLAGS)
+                     $(LIBGLOM_LIBS) $(PYTHON_LDFLAGS)
 
 if !WIN32
 libglom_1_0_la_LIBADD += -lutil
@@ -80,15 +80,15 @@
 
 test_sharedptr_layoutitem_SOURCES = test_sharedptr_layoutitem.cc
 test_sharedptr_layoutitem_LDADD =  libglom-1.0.la \
-              $(GLOM_LIBS)
+              $(LIBGLOM_LIBS)
 
 test_connectionpool_SOURCES = test_connectionpool.cc
 test_connectionpool_LDADD =  libglom-1.0.la \
-              $(GLOM_LIBS)
+              $(LIBGLOM_LIBS)
 
 test_document_SOURCES = test_document.cc
 test_document_LDADD =  libglom-1.0.la \
-              $(GLOM_LIBS)
+              $(LIBGLOM_LIBS)
 
 if !WIN32
 test_sharedptr_layoutitem_LDADD += -lutil

Modified: trunk/glom/libglom/connectionpool_backends/Makefile.am
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/Makefile.am	(original)
+++ trunk/glom/libglom/connectionpool_backends/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = \
-	-I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS) \
+	-I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS) \
 	-DEXEEXT=\""$(EXEEXT)"\"
 
 noinst_LTLIBRARIES = libconnectionpool_backends.la

Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.cc	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.cc	Fri Mar 27 10:47:21 2009
@@ -28,7 +28,7 @@
 
 #include <glibmm/i18n.h>
 
-#include "../gst-package.h"
+#include <libglom/gst-package.h>
 
 #ifndef G_OS_WIN32
 #include <sys/types.h>

Modified: trunk/glom/libglom/data_structure/Makefile.am
==============================================================================
--- trunk/glom/libglom/data_structure/Makefile.am	(original)
+++ trunk/glom/libglom/data_structure/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,6 +1,6 @@
 SUBDIRS = layout
 
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
 
 h_sources = field.h \
                               foundset.h \

Modified: trunk/glom/libglom/data_structure/layout/Makefile.am
==============================================================================
--- trunk/glom/libglom/data_structure/layout/Makefile.am	(original)
+++ trunk/glom/libglom/data_structure/layout/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,6 +1,6 @@
 SUBDIRS = report_parts
 
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
 
 noinst_LTLIBRARIES = libdata_structure_layout.la
 

Modified: trunk/glom/libglom/data_structure/layout/custom_title.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/custom_title.h	(original)
+++ trunk/glom/libglom/data_structure/layout/custom_title.h	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUT_CUSTOM_TITLE_H
 #define GLOM_DATASTRUCTURE_LAYOUT_CUSTOM_TITLE_H
 
-#include "../translatable_item.h"
+#include <libglom/data_structure/translatable_item.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/fieldformatting.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/fieldformatting.h	(original)
+++ trunk/glom/libglom/data_structure/layout/fieldformatting.h	Fri Mar 27 10:47:21 2009
@@ -21,9 +21,9 @@
 #ifndef GLOM_DATASTRUCTURE_FIELDFORMATTING_H
 #define GLOM_DATASTRUCTURE_FIELDFORMATTING_H
 
-#include "usesrelationship.h"
-#include "../numeric_format.h"
-#include "../relationship.h"
+#include <libglom/data_structure/layout/usesrelationship.h>
+#include <libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/relationship.h>
 #include <libglom/sharedptr.h>
 #include <libgdamm.h>
 

Modified: trunk/glom/libglom/data_structure/layout/layoutitem.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem.h	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_H
 
-#include "../translatable_item.h"
+#include <libglom/data_structure/translatable_item.h>
 #include <glibmm/ustring.h>
 
 namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_field.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_field.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_field.h	Fri Mar 27 10:47:21 2009
@@ -21,12 +21,12 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_FIELD_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_FIELD_H
 
-#include "layoutitem.h"
-#include "usesrelationship.h"
-#include "../field.h"
-#include "../numeric_format.h"
-#include "../relationship.h"
-#include "custom_title.h"
+#include <libglom/data_structure/layout/layoutitem.h>
+#include <libglom/data_structure/layout/usesrelationship.h>
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/relationship.h>
+#include <libglom/data_structure/layout/custom_title.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h	Fri Mar 27 10:47:21 2009
@@ -22,8 +22,8 @@
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_NOTEBOOK_H
 
 #include "layoutgroup.h"
-#include "../field.h"
-#include "../relationship.h"
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/relationship.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_portal.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_portal.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_portal.h	Fri Mar 27 10:47:21 2009
@@ -22,8 +22,8 @@
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_PORTAL_H
 
 #include "layoutgroup.h"
-#include "../field.h"
-#include "../relationship.h"
+#include <libglom/data_structure/field.h>
+#include <libglom/data_structure/relationship.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
 
 noinst_LTLIBRARIES = libdata_structure_layout_reportparts.la
 

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc	Fri Mar 27 10:47:21 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include "layoutitem_fieldsummary.h"
+#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_FIELDSUMMARY_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_FIELDSUMMARY_H
 
-#include "../layoutitem_field.h"
+#include <libglom/data_structure/layout/layoutitem_field.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h	Fri Mar 27 10:47:21 2009
@@ -21,8 +21,8 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_FOOTER_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_FOOTER_H
 
-#include "../layoutgroup.h"
-#include "../../field.h"
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/field.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc	Fri Mar 27 10:47:21 2009
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include "layoutitem_groupby.h"
-#include "../layoutitem_field.h"
+#include <libglom/data_structure/layout/report_parts/layoutitem_groupby.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h	Fri Mar 27 10:47:21 2009
@@ -21,8 +21,8 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_GROUPBY_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_GROUPBY_H
 
-#include "../layoutgroup.h"
-#include "../layoutitem_field.h"
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
 #include <map>
 
 namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h	Fri Mar 27 10:47:21 2009
@@ -21,8 +21,8 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_HEADER_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_HEADER_H
 
-#include "../layoutgroup.h"
-#include "../../field.h"
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/field.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc	Fri Mar 27 10:47:21 2009
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include "layoutitem_summary.h"
-#include "../layoutitem_field.h"
+#include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
+#include <libglom/data_structure/layout/layoutitem_field.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_SUMMARY_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_SUMMARY_H
 
-#include "../layoutgroup.h"
+#include <libglom/data_structure/layout/layoutgroup.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h	Fri Mar 27 10:47:21 2009
@@ -21,8 +21,8 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUTITEM_VERTICALGROUP_H
 #define GLOM_DATASTRUCTURE_LAYOUTITEM_VERTICALGROUP_H
 
-#include "../layoutgroup.h"
-#include "../../field.h"
+#include <libglom/data_structure/layout/layoutgroup.h>
+#include <libglom/data_structure/field.h>
 
 namespace Glom
 {

Modified: trunk/glom/libglom/data_structure/layout/usesrelationship.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/usesrelationship.h	(original)
+++ trunk/glom/libglom/data_structure/layout/usesrelationship.h	Fri Mar 27 10:47:21 2009
@@ -21,8 +21,8 @@
 #ifndef GLOM_DATASTRUCTURE_LAYOUT_USESRELATIONSHIP_H
 #define GLOM_DATASTRUCTURE_LAYOUT_USESRELATIONSHIP_H
 
-#include "../numeric_format.h"
-#include "../relationship.h"
+#include <libglom/data_structure/numeric_format.h>
+#include <libglom/data_structure/relationship.h>
 #include <libglom/sharedptr.h>
 #include <libgdamm.h>
 

Modified: trunk/glom/libglom/document/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/Makefile.am	(original)
+++ trunk/glom/libglom/document/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,6 +1,6 @@
 SUBDIRS = bakery
 
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
 
 h_sources = document_glom.h view.h
 cc_sources = document_glom.cc

Modified: trunk/glom/libglom/document/bakery/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/bakery/Makefile.am	(original)
+++ trunk/glom/libglom/document/bakery/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,6 +1,6 @@
 SUBDIRS = view
 
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
 
 h_sources = document.h document_xml.h
 cc_sources = document.cc document_xml.cc

Modified: trunk/glom/libglom/document/bakery/view/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/bakery/view/Makefile.am	(original)
+++ trunk/glom/libglom/document/bakery/view/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -4,7 +4,7 @@
 
 # We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
 # We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS) $(PYTHON_INCLUDES) \
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS) $(PYTHON_INCLUDES) \
            -DGLOM_GLADEDIR=\""$(gladedir)/"\"
 
 

Modified: trunk/glom/libglom/document/document_glom.h
==============================================================================
--- trunk/glom/libglom/document/document_glom.h	(original)
+++ trunk/glom/libglom/document/document_glom.h	Fri Mar 27 10:47:21 2009
@@ -37,8 +37,7 @@
 #include <libglom/data_structure/report.h>
 #include <libglom/data_structure/print_layout.h>
 #include <libglom/data_structure/foundset.h>
-#include "../appstate.h"
-//#include <gtkmm/window.h>
+#include <libglom/appstate.h>
 #include <vector>
 #include <map>
 #include <limits> // for numeric_limits

Modified: trunk/glom/libglom/python_embed/Makefile.am
==============================================================================
--- trunk/glom/libglom/python_embed/Makefile.am	(original)
+++ trunk/glom/libglom/python_embed/Makefile.am	Fri Mar 27 10:47:21 2009
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom  $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS) $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom  $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS) $(PYTHON_INCLUDES)
 
 noinst_LTLIBRARIES = libglom_python_embed.la
 libglom_python_embed_la_SOURCES = py_glom_record.h py_glom_record.cc \

Modified: trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc	(original)
+++ trunk/glom/libglom/python_embed/py_glom_relatedrecord.cc	Fri Mar 27 10:47:21 2009
@@ -32,7 +32,7 @@
 #include <libglom/data_structure/field.h>
 #include <glibmm/ustring.h>
 
-#include "glom/application.h"
+//#include "glom/application.h"
 
 namespace Glom
 {

Modified: trunk/glom/libglom/spawn_with_feedback.cc
==============================================================================
--- trunk/glom/libglom/spawn_with_feedback.cc	(original)
+++ trunk/glom/libglom/spawn_with_feedback.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include <libglom/spawn_with_feedback.h>
 #include <libglom/dialog_progress_creating.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <gtkmm/main.h>
 #include <gtkmm/messagedialog.h>
 #include <glibmm/i18n.h>
@@ -423,7 +423,9 @@
 }
 
 // Callback handlers for execute_command_line_and_wait_until_second_command_returns_success
-namespace {
+namespace
+{
+
   bool on_timeout(const std::string& second_command, const std::string& success_text, Dialog_ProgressCreating* dialog_progress)
   {
     Glib::ustring stored_env_lang;
@@ -499,7 +501,8 @@
     dialog_progress->pulse();
     return true;
   }
-}
+
+} //Anonymous namespace
 
 bool execute_command_line_and_wait_until_second_command_returns_success(const std::string& command, const std::string& second_command, const Glib::ustring& message, Gtk::Window* parent_window, const std::string& success_text)
 {

Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc	(original)
+++ trunk/glom/main.cc	Fri Mar 27 10:47:21 2009
@@ -49,7 +49,7 @@
 #endif
 
 #include "application.h"
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 
 #ifndef G_OS_WIN32
 #include <fontconfig/fontconfig.h> //For cleanup.

Modified: trunk/glom/mode_data/box_data_details.cc
==============================================================================
--- trunk/glom/mode_data/box_data_details.cc	(original)
+++ trunk/glom/mode_data/box_data_details.cc	Fri Mar 27 10:47:21 2009
@@ -24,7 +24,7 @@
 #include <libglom/data_structure/relationship.h>
 #include <libglom/data_structure/glomconversions.h>
 #include "dialog_layout_details.h"
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <libglom/utils.h>
 #include <glom/glom_privs.h>
 #include "../xsl_utils.h"

Modified: trunk/glom/mode_data/box_data_details.h
==============================================================================
--- trunk/glom/mode_data/box_data_details.h	(original)
+++ trunk/glom/mode_data/box_data_details.h	Fri Mar 27 10:47:21 2009
@@ -24,11 +24,11 @@
 #include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data.h"
-//#include "box_data_list_related.h"
+//#include <glom/mode_data/box_data_list_related.h>
 #include "flowtablewithfields.h"
-#include "../utility_widgets/placeholder.h"
+#include <glom/utility_widgets/placeholder.h>
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-#include "../utility_widgets/layouttoolbar.h"
+#include <glom/utility_widgets/layouttoolbar.h>
 #endif
 
 namespace Glom

Modified: trunk/glom/mode_data/box_data_list.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list.cc	(original)
+++ trunk/glom/mode_data/box_data_list.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "box_data_list.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glom/reports/report_builder.h>
 #include "dialog_layout_list.h"
 #include <glom/glom_privs.h>

Modified: trunk/glom/mode_data/box_data_list_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list_related.cc	(original)
+++ trunk/glom/mode_data/box_data_list_related.cc	Fri Mar 27 10:47:21 2009
@@ -18,10 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "box_data_list_related.h"
+#include <glom/mode_data/box_data_list_related.h>
 #include "dialog_layout_list_related.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <libglom/utils.h> //For bold_message()).
 #include <glibmm/i18n.h>

Modified: trunk/glom/mode_data/box_data_manyrecords.cc
==============================================================================
--- trunk/glom/mode_data/box_data_manyrecords.cc	(original)
+++ trunk/glom/mode_data/box_data_manyrecords.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "box_data_manyrecords.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glom/reports/report_builder.h>
 #include "dialog_layout_list.h"
 #include <glom/glom_privs.h>

Modified: trunk/glom/mode_data/box_data_portal.cc
==============================================================================
--- trunk/glom/mode_data/box_data_portal.cc	(original)
+++ trunk/glom/mode_data/box_data_portal.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "box_data_portal.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glom/frame_glom.h> //For show_ok_dialog()
 #include <libglom/utils.h> //For bold_message()).
 #include <glibmm/i18n.h>

Modified: trunk/glom/mode_data/dialog_layout_details.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.cc	(original)
+++ trunk/glom/mode_data/dialog_layout_details.cc	Fri Mar 27 10:47:21 2009
@@ -22,7 +22,7 @@
 #include "dialog_choose_relationship.h"
 #include "../layout_item_dialogs/dialog_buttonscript.h"
 #include "../layout_item_dialogs/dialog_notebook.h"
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include "../frame_glom.h" //For show_ok_dialog()
 //#include <libgnome/gnome-i18n.h>
 #include <libglom/utils.h> //For bold_message()).

Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc	(original)
+++ trunk/glom/mode_data/flowtablewithfields.cc	Fri Mar 27 10:47:21 2009
@@ -27,11 +27,11 @@
 #include <glom/utility_widgets/labelglom.h>
 #include <glom/utility_widgets/dialog_flowtable.h>
 #include <glom/utility_widgets/placeholder-glom.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <gtkmm/checkbutton.h>
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
-#include "box_data_list_related.h"
+#include <glom/glade_utils.h>
+#include <glom/mode_data/box_data_list_related.h>
 #include "dialog_choose_relationship.h"
 #include <libglom/utils.h> //For bold_message()).
 #include <glibmm/i18n.h>

Modified: trunk/glom/mode_data/flowtablewithfields.h
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.h	(original)
+++ trunk/glom/mode_data/flowtablewithfields.h	Fri Mar 27 10:47:21 2009
@@ -40,7 +40,7 @@
 #include <libglom/document/document_glom.h>
 #include <glom/utility_widgets/layoutwidgetbase.h>
 #include <glom/utility_widgets/layoutwidgetutils.h>
-#include "box_data_list_related.h"
+#include <glom/mode_data/box_data_list_related.h>
 #include "box_data_calendar_related.h"
 #include "treestore_layout.h" //Forthe enum.
 #include <map>

Modified: trunk/glom/mode_design/fields/box_db_table_definition.cc
==============================================================================
--- trunk/glom/mode_design/fields/box_db_table_definition.cc	(original)
+++ trunk/glom/mode_design/fields/box_db_table_definition.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "box_db_table_definition.h"
 #include <glom/frame_glom.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <libglom/utils.h> //For bold_message()).
 #include <libglom/libglom_config.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/mode_design/fields/dialog_fielddefinition.cc
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fielddefinition.cc	(original)
+++ trunk/glom/mode_design/fields/dialog_fielddefinition.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "dialog_fielddefinition.h"
 #include "dialog_fieldcalculation.h"
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include "../../box_db_table.h"
 //#include <libgnome/gnome-i18n.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_print_layout.cc	(original)
+++ trunk/glom/mode_design/print_layouts/canvas_print_layout.cc	Fri Mar 27 10:47:21 2009
@@ -31,7 +31,7 @@
 #include <glom/utility_widgets/canvas/canvas_text_movable.h>
 #include <libglom/data_structure/glomconversions.h>
 
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc	(original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "dialog_text_formatting.h"
 #include <glom/box_db_table.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/mode_design/script_library/dialog_script_library.cc
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_script_library.cc	(original)
+++ trunk/glom/mode_design/script_library/dialog_script_library.cc	Fri Mar 27 10:47:21 2009
@@ -22,7 +22,7 @@
 #include "dialog_script_library.h"
 #include "../../python_embed/glom_python.h"
 #include <libglom/data_structure/glomconversions.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glom/mode_design/script_library/dialog_new_script.h>
 #include <gtksourceviewmm/sourcelanguagemanager.h>
 #include <glom/application.h>

Modified: trunk/glom/mode_design/users/dialog_groups_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.cc	(original)
+++ trunk/glom/mode_design/users/dialog_groups_list.cc	Fri Mar 27 10:47:21 2009
@@ -23,7 +23,7 @@
 #include "dialog_users_list.h"
 #include "dialog_new_group.h"
 #include <libglom/standard_table_prefs_fields.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glom/glom_privs.h>
 //#include <libgnome/gnome-i18n.h>
 #include <libglom/utils.h> //For bold_message()).

Modified: trunk/glom/mode_design/users/dialog_users_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_users_list.cc	(original)
+++ trunk/glom/mode_design/users/dialog_users_list.cc	Fri Mar 27 10:47:21 2009
@@ -22,7 +22,7 @@
 #include "dialog_user.h"
 #include "dialog_choose_user.h"
 #include <glom/glom_privs.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <libglom/utils.h> //For bold_message()).
 //#include <libgnome/gnome-i18n.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/reports/dialog_layout_report.cc
==============================================================================
--- trunk/glom/reports/dialog_layout_report.cc	(original)
+++ trunk/glom/reports/dialog_layout_report.cc	Fri Mar 27 10:47:21 2009
@@ -28,7 +28,7 @@
 #include <libglom/data_structure/layout/layoutitem_field.h>
 #include <libglom/data_structure/layout/layoutitem_text.h>
 #include <libglom/data_structure/layout/layoutitem_image.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include "../mode_data/dialog_choose_field.h"
 #include "../layout_item_dialogs/dialog_field_layout.h"
 #include "../layout_item_dialogs/dialog_group_by.h"

Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc	(original)
+++ trunk/glom/translation/window_translations.cc	Fri Mar 27 10:47:21 2009
@@ -24,7 +24,7 @@
 #include "dialog_copy_translation.h"
 #include <libglom/utils.h> //For bold_message()).
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 
 #include <glibmm/i18n.h>
 #include <string.h> // for memset

Modified: trunk/glom/utility_widgets/buttonglom.cc
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.cc	(original)
+++ trunk/glom/utility_widgets/buttonglom.cc	Fri Mar 27 10:47:21 2009
@@ -20,11 +20,11 @@
 
 #include "buttonglom.h"
 #include <gtkmm/messagedialog.h>
-#include "../application.h"
-#include "../libglom/glade_utils.h"
-#include "dialog_layoutitem_properties.h"
+#include <glom/application.h>
+#include <glom/glade_utils.h>
+#include <glom/utility_widgets/dialog_layoutitem_properties.h>
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-#include "../layout_item_dialogs/dialog_buttonscript.h"
+#include <glom/layout_item_dialogs/dialog_buttonscript.h>
 #endif
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream

Modified: trunk/glom/utility_widgets/checkglom.cc
==============================================================================
--- trunk/glom/utility_widgets/checkglom.cc	(original)
+++ trunk/glom/utility_widgets/checkglom.cc	Fri Mar 27 10:47:21 2009
@@ -21,7 +21,7 @@
 #include "checkglom.h"
 #include <gtkmm/messagedialog.h>
 #include "../dialog_invalid_data.h"
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 
 #include <iostream>   // for cout, endl

Modified: trunk/glom/utility_widgets/comboentryglom.cc
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.cc	(original)
+++ trunk/glom/utility_widgets/comboentryglom.cc	Fri Mar 27 10:47:21 2009
@@ -23,7 +23,7 @@
 #include <gtkmm/messagedialog.h>
 #include "../dialog_invalid_data.h"
 #include <libglom/data_structure/glomconversions.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
 

Modified: trunk/glom/utility_widgets/comboglom.cc
==============================================================================
--- trunk/glom/utility_widgets/comboglom.cc	(original)
+++ trunk/glom/utility_widgets/comboglom.cc	Fri Mar 27 10:47:21 2009
@@ -23,7 +23,7 @@
 #include <gtkmm/messagedialog.h>
 #include "../dialog_invalid_data.h"
 #include <libglom/data_structure/glomconversions.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
 

Modified: trunk/glom/utility_widgets/datawidget.cc
==============================================================================
--- trunk/glom/utility_widgets/datawidget.cc	(original)
+++ trunk/glom/utility_widgets/datawidget.cc	Fri Mar 27 10:47:21 2009
@@ -27,13 +27,13 @@
 #include "textviewglom.h"
 #include "imageglom.h"
 #include <libglom/data_structure/glomconversions.h>
-#include "../application.h"
+#include <glom/application.h>
 #include "../mode_data/dialog_choose_field.h"
 #include "dialog_choose_id.h"
 #include "dialog_choose_date.h"
 #include "../layout_item_dialogs/dialog_field_layout.h"
 #include <libglom/utils.h>
-#include <libglom/glade_utils.h>
+#include <glom/glade_utils.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/utility_widgets/entryglom.cc
==============================================================================
--- trunk/glom/utility_widgets/entryglom.cc	(original)
+++ trunk/glom/utility_widgets/entryglom.cc	Fri Mar 27 10:47:21 2009
@@ -23,7 +23,7 @@
 #include <gtkmm/messagedialog.h>
 #include "../dialog_invalid_data.h"
 #include <libglom/data_structure/glomconversions.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
 

Modified: trunk/glom/utility_widgets/imageglom.cc
==============================================================================
--- trunk/glom/utility_widgets/imageglom.cc	(original)
+++ trunk/glom/utility_widgets/imageglom.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "imageglom.h"
 #include <glibmm/i18n.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <libglom/data_structure/glomconversions.h>
 //#include <sstream> //For stringstream
 

Modified: trunk/glom/utility_widgets/labelglom.cc
==============================================================================
--- trunk/glom/utility_widgets/labelglom.cc	(original)
+++ trunk/glom/utility_widgets/labelglom.cc	Fri Mar 27 10:47:21 2009
@@ -20,10 +20,10 @@
 
 #include "labelglom.h"
 #include <gtkmm/messagedialog.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 #include "../layout_item_dialogs/dialog_textobject.h"
-#include "../libglom/glade_utils.h"
+#include <glom/glade_utils.h>
 #include "../mode_data/flowtablewithfields.h"
 //#include <sstream> //For stringstream
 

Modified: trunk/glom/utility_widgets/layoutwidgetbase.cc
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetbase.cc	(original)
+++ trunk/glom/utility_widgets/layoutwidgetbase.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "layoutwidgetbase.h"
 #include <glibmm/i18n.h>
-#include "../application.h"
+#include <glom/application.h>
 
 namespace Glom
 {

Modified: trunk/glom/utility_widgets/layoutwidgetmenu.cc
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetmenu.cc	(original)
+++ trunk/glom/utility_widgets/layoutwidgetmenu.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "layoutwidgetfield.h"
 #include <glibmm/i18n.h>
-#include "../application.h"
+#include <glom/application.h>
 #include "../mode_data/flowtablewithfields.h"
 
 namespace Glom

Modified: trunk/glom/utility_widgets/notebookglom.cc
==============================================================================
--- trunk/glom/utility_widgets/notebookglom.cc	(original)
+++ trunk/glom/utility_widgets/notebookglom.cc	Fri Mar 27 10:47:21 2009
@@ -20,7 +20,7 @@
 
 #include "notebookglom.h"
 #include <gtkmm/messagedialog.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
 

Modified: trunk/glom/utility_widgets/notebooklabelglom.cc
==============================================================================
--- trunk/glom/utility_widgets/notebooklabelglom.cc	(original)
+++ trunk/glom/utility_widgets/notebooklabelglom.cc	Fri Mar 27 10:47:21 2009
@@ -19,7 +19,7 @@
  */
 
 #include "notebooklabelglom.h"
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 
 namespace Glom

Modified: trunk/glom/utility_widgets/placeholder-glom.cc
==============================================================================
--- trunk/glom/utility_widgets/placeholder-glom.cc	(original)
+++ trunk/glom/utility_widgets/placeholder-glom.cc	Fri Mar 27 10:47:21 2009
@@ -25,7 +25,7 @@
 #include "placeholder-glom.h"
 #include "labelglom.h"
 #include <gtkmm/messagedialog.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 #include <string.h> // for memset
 

Modified: trunk/glom/utility_widgets/textviewglom.cc
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.cc	(original)
+++ trunk/glom/utility_widgets/textviewglom.cc	Fri Mar 27 10:47:21 2009
@@ -23,7 +23,7 @@
 #include <gtkmm/messagedialog.h>
 #include "../dialog_invalid_data.h"
 #include <libglom/data_structure/glomconversions.h>
-#include "../application.h"
+#include <glom/application.h>
 #include <glibmm/i18n.h>
 //#include <sstream> //For stringstream
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]