glom r2038 - in trunk: . glom/libglom/document po

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 31 06:45:08 2009
New Revision: 2038
URL: http://svn.gnome.org/viewvc/glom?rev=2038&view=rev

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

* config.h.in: Remove definitions that are in 
glom/libglom/libglom_config_h.in
* configure.ac: Depend on pygobject instead of pygtk and remove duplicate 
dependencies in Glom and libglom.
* glom/libglom/document/document_glom.h: Remove SWIG directives because I 
am now using a separate SWIG .i file.
* po/POTFILES.in: Updated.

Modified:
   trunk/ChangeLog
   trunk/config.h.in
   trunk/configure.ac
   trunk/glom/libglom/document/document_glom.h
   trunk/po/POTFILES.in

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Tue Mar 31 06:45:08 2009
@@ -101,21 +101,6 @@
 /* The domain name to use with gettext. */
 #undef GETTEXT_PACKAGE
 
-/* "definition of GLOM_DTD_INSTALL_DIR" */
-#undef GLOM_DTD_INSTALL_DIR
-
-/* Whether to disable support for self-hosting and developer mode */
-#undef GLOM_ENABLE_CLIENT_ONLY
-
-/* Whether to enable support for the maemo platform */
-#undef GLOM_ENABLE_MAEMO
-
-/* Whether to enable support for PostgreSQL databases. */
-#undef GLOM_ENABLE_POSTGRESQL
-
-/* Whether to enable support for SQLite databases. */
-#undef GLOM_ENABLE_SQLITE
-
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 31 06:45:08 2009
@@ -105,7 +105,7 @@
 fi
 
 # Libraries used by libglom:
-REQUIRED_LIBGLOM_LIBS="giomm-2.4 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"
+REQUIRED_LIBGLOM_LIBS="giomm-2.4 gthread-2.0 libxml++-2.6 pygda-4.0 >= 2.25.3 pygobject-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";
@@ -117,7 +117,7 @@
 
 
 # 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="gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-1.0 >= 0.14.0"
 
 REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS $REQUIRED_LIBGLOM_LIBS"
 	

Modified: trunk/glom/libglom/document/document_glom.h
==============================================================================
--- trunk/glom/libglom/document/document_glom.h	(original)
+++ trunk/glom/libglom/document/document_glom.h	Tue Mar 31 06:45:08 2009
@@ -42,25 +42,6 @@
 #include <map>
 #include <limits> // for numeric_limits
 
-// Instructions to swig, telling it what Java API to generate:
-#ifdef SWIG
-%module glom
-%include "std_string.i"
-%include "std_vector.i"
-%include "typemaps.i"
-
-%inline %{ #include <libglom/document/document_glom.h> %}
-%inline %{ using namespace Glom; %}
-//%inline %{ typedef unsigned int guint; %}
-//%inline %{ namespace Glib { typedef std::string ustring; } %}
-
-
-
-//Stick to the client-only API for swig, for now.
-//TODO: Watch out if some of these are virtual.
-#define GLOM_ENABLE_CLIENT_ONLY 1
-#endif //SWIG
-
 namespace Gtk
 {
 class Window;

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Mar 31 06:45:08 2009
@@ -18,13 +18,12 @@
 glom/frame_glom.cc
 glom/glom_developer.glade
 glom/glom.glade
-glom/bakery/App.cc
-glom/bakery/AppInstanceManager.cc
-glom/bakery/App_WithDoc_Gtk.cc
-glom/bakery/GtkDialogs.cc
-glom/bakery/App_Gtk.cc
-glom/bakery/App_WithDoc.cc
-glom/bakery/Dialog_OfferSave.cc
+glom/glade_utils.cc
+glom/utils_ui.cc
+glom/bakery/app.cc
+glom/bakery/app_withdoc_gtk.cc
+glom/bakery/app_withdoc.cc
+glom/bakery/dialog_offersave.cc
 glom/layout_item_dialogs/box_formatting.cc
 glom/layout_item_dialogs/combo_summarytype.cc
 glom/layout_item_dialogs/dialog_field_layout.cc
@@ -59,11 +58,11 @@
 glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc
 glom/libglom/data_structure/translatable_item.cc
 glom/libglom/document/document_glom.cc
-glom/libglom/document/bakery/Document.cc
-glom/libglom/document/bakery/Document_XML.cc
-glom/libglom/document/bakery/view/ViewBase.cc
-glom/libglom/document/bakery/view/View.cc
-glom/libglom/document/bakery/view/View_Composite.cc
+glom/libglom/document/bakery/document.cc
+glom/libglom/document/bakery/document_xml.cc
+glom/libglom/document/bakery/view/viewbase.cc
+glom/libglom/document/bakery/view/view.cc
+glom/libglom/document/bakery/view/view_composite.cc
 glom/libglom/gst-package.c
 glom/libglom/spawn_with_feedback.cc
 glom/libglom/utils.cc