[Gnucash-changes] r11981 - gnucash/trunk - Include file cleanup. Remove the messages.[ch] files in favor of the

David Hampton hampton at cvs.gnucash.org
Sat Nov 19 18:53:41 EST 2005


Author: hampton
Date: 2005-11-19 18:53:34 -0500 (Sat, 19 Nov 2005)
New Revision: 11981
Trac: http://svn.gnucash.org/trac/changeset/11981

Removed:
   gnucash/trunk/src/engine/messages.c
   gnucash/trunk/src/engine/messages.h
Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/app-utils/file-utils.c
   gnucash/trunk/src/app-utils/gnc-exp-parser.c
   gnucash/trunk/src/app-utils/gnc-gettext-util.c
   gnucash/trunk/src/app-utils/gnc-ui-util.c
   gnucash/trunk/src/app-utils/guile-util.c
   gnucash/trunk/src/app-utils/option-util.c
   gnucash/trunk/src/backend/file/gnc-backend-file.c
   gnucash/trunk/src/backend/file/io-gncbin-r.c
   gnucash/trunk/src/backend/postgres/PostgresBackend.c
   gnucash/trunk/src/backend/postgres/putil.c
   gnucash/trunk/src/backend/postgres/upgrade.c
   gnucash/trunk/src/business/business-core/gncBillTerm.c
   gnucash/trunk/src/business/business-core/gncCustomer.c
   gnucash/trunk/src/business/business-core/gncEmployee.c
   gnucash/trunk/src/business/business-core/gncEntry.c
   gnucash/trunk/src/business/business-core/gncInvoice.c
   gnucash/trunk/src/business/business-core/gncJob.c
   gnucash/trunk/src/business/business-core/gncOrder.c
   gnucash/trunk/src/business/business-core/gncTaxTable.c
   gnucash/trunk/src/business/business-core/gncVendor.c
   gnucash/trunk/src/business/business-core/test/test-business.c
   gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
   gnucash/trunk/src/business/business-gnome/business-options-gnome.c
   gnucash/trunk/src/business/business-gnome/business-urls.c
   gnucash/trunk/src/business/business-gnome/businessmod-gnome.c
   gnucash/trunk/src/business/business-gnome/dialog-billterms.c
   gnucash/trunk/src/business/business-gnome/dialog-customer.c
   gnucash/trunk/src/business/business-gnome/dialog-employee.c
   gnucash/trunk/src/business/business-gnome/dialog-job.c
   gnucash/trunk/src/business/business-gnome/dialog-order.c
   gnucash/trunk/src/business/business-gnome/dialog-payment.c
   gnucash/trunk/src/business/business-gnome/dialog-vendor.c
   gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
   gnucash/trunk/src/business/business-gnome/search-owner.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerLayout.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c
   gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
   gnucash/trunk/src/engine/Account.c
   gnucash/trunk/src/engine/FreqSpec.c
   gnucash/trunk/src/engine/Makefile.am
   gnucash/trunk/src/engine/SchedXaction.c
   gnucash/trunk/src/engine/Scrub.c
   gnucash/trunk/src/engine/Scrub2.c
   gnucash/trunk/src/engine/Transaction.c
   gnucash/trunk/src/engine/cap-gains.c
   gnucash/trunk/src/engine/gnc-commodity.c
   gnucash/trunk/src/engine/test/test-object.c
   gnucash/trunk/src/engine/test/test-querynew.c
   gnucash/trunk/src/gnome-search/dialog-search.c
   gnucash/trunk/src/gnome-search/gncmod-gnome-search.c
   gnucash/trunk/src/gnome-search/search-account.c
   gnucash/trunk/src/gnome-search/search-boolean.c
   gnucash/trunk/src/gnome-search/search-core-type.h
   gnucash/trunk/src/gnome-search/search-date.c
   gnucash/trunk/src/gnome-search/search-double.c
   gnucash/trunk/src/gnome-search/search-int64.c
   gnucash/trunk/src/gnome-search/search-numeric.c
   gnucash/trunk/src/gnome-search/search-reconciled.c
   gnucash/trunk/src/gnome-search/search-string.c
   gnucash/trunk/src/gnome-utils/QuickFill.c
   gnucash/trunk/src/gnome-utils/cursors.c
   gnucash/trunk/src/gnome-utils/dialog-account.c
   gnucash/trunk/src/gnome-utils/dialog-commodity.c
   gnucash/trunk/src/gnome-utils/dialog-commodity.h
   gnucash/trunk/src/gnome-utils/dialog-options.c
   gnucash/trunk/src/gnome-utils/dialog-options.h
   gnucash/trunk/src/gnome-utils/dialog-transfer.c
   gnucash/trunk/src/gnome-utils/dialog-utils.c
   gnucash/trunk/src/gnome-utils/dialog-utils.h
   gnucash/trunk/src/gnome-utils/druid-gconf-setup.c
   gnucash/trunk/src/gnome-utils/druid-utils.c
   gnucash/trunk/src/gnome-utils/gnc-account-sel.c
   gnucash/trunk/src/gnome-utils/gnc-account-sel.h
   gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
   gnucash/trunk/src/gnome-utils/gnc-amount-edit.h
   gnucash/trunk/src/gnome-utils/gnc-commodity-edit.c
   gnucash/trunk/src/gnome-utils/gnc-commodity-edit.h
   gnucash/trunk/src/gnome-utils/gnc-currency-edit.c
   gnucash/trunk/src/gnome-utils/gnc-currency-edit.h
   gnucash/trunk/src/gnome-utils/gnc-date-delta.c
   gnucash/trunk/src/gnome-utils/gnc-date-delta.h
   gnucash/trunk/src/gnome-utils/gnc-date-edit.c
   gnucash/trunk/src/gnome-utils/gnc-date-format.c
   gnucash/trunk/src/gnome-utils/gnc-date-format.h
   gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
   gnucash/trunk/src/gnome-utils/gnc-dialog.c
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c
   gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
   gnucash/trunk/src/gnome-utils/gnc-embedded-window.c
   gnucash/trunk/src/gnome-utils/gnc-file.c
   gnucash/trunk/src/gnome-utils/gnc-frequency.c
   gnucash/trunk/src/gnome-utils/gnc-frequency.h
   gnucash/trunk/src/gnome-utils/gnc-general-select.c
   gnucash/trunk/src/gnome-utils/gnc-general-select.h
   gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
   gnucash/trunk/src/gnome-utils/gnc-gui-query.c
   gnucash/trunk/src/gnome-utils/gnc-html-guppi.h
   gnucash/trunk/src/gnome-utils/gnc-html.c
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
   gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c
   gnucash/trunk/src/gnome-utils/gnc-period-select.c
   gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c
   gnucash/trunk/src/gnome-utils/gnc-plugin-manager.c
   gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c
   gnucash/trunk/src/gnome-utils/gnc-plugin.c
   gnucash/trunk/src/gnome-utils/gnc-query-list.c
   gnucash/trunk/src/gnome-utils/gnc-recurrence.c
   gnucash/trunk/src/gnome-utils/gnc-splash.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view.c
   gnucash/trunk/src/gnome-utils/misc-gnome-utils.c
   gnucash/trunk/src/gnome-utils/print-session.c
   gnucash/trunk/src/gnome-utils/print-session.h
   gnucash/trunk/src/gnome-utils/search-param.c
   gnucash/trunk/src/gnome/dialog-chart-export.c
   gnucash/trunk/src/gnome/dialog-chart-export.h
   gnucash/trunk/src/gnome/dialog-commodities.c
   gnucash/trunk/src/gnome/dialog-fincalc.c
   gnucash/trunk/src/gnome/dialog-fincalc.h
   gnucash/trunk/src/gnome/dialog-find-transactions.c
   gnucash/trunk/src/gnome/dialog-find-transactions.h
   gnucash/trunk/src/gnome/dialog-new-user.c
   gnucash/trunk/src/gnome/dialog-price-edit-db.c
   gnucash/trunk/src/gnome/dialog-price-editor.c
   gnucash/trunk/src/gnome/dialog-print-check.c
   gnucash/trunk/src/gnome/dialog-print-check.h
   gnucash/trunk/src/gnome/dialog-progress.c
   gnucash/trunk/src/gnome/dialog-scheduledxaction.c
   gnucash/trunk/src/gnome/dialog-scheduledxaction.h
   gnucash/trunk/src/gnome/dialog-sx-from-trans.c
   gnucash/trunk/src/gnome/dialog-sxsincelast.c
   gnucash/trunk/src/gnome/dialog-tax-info.c
   gnucash/trunk/src/gnome/dialog-totd.c
   gnucash/trunk/src/gnome/druid-acct-period.c
   gnucash/trunk/src/gnome/druid-hierarchy.c
   gnucash/trunk/src/gnome/druid-loan.c
   gnucash/trunk/src/gnome/druid-merge.c
   gnucash/trunk/src/gnome/druid-stock-split.c
   gnucash/trunk/src/gnome/gnc-plugin-account-tree.c
   gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
   gnucash/trunk/src/gnome/gnc-plugin-budget.c
   gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
   gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
   gnucash/trunk/src/gnome/gnc-plugin-page-register.c
   gnucash/trunk/src/gnome/gnc-plugin-register.c
   gnucash/trunk/src/gnome/gnc-split-reg.c
   gnucash/trunk/src/gnome/lot-viewer.c
   gnucash/trunk/src/gnome/reconcile-list.c
   gnucash/trunk/src/gnome/top-level.c
   gnucash/trunk/src/gnome/window-main-summarybar.c
   gnucash/trunk/src/gnome/window-main-summarybar.h
   gnucash/trunk/src/gnome/window-reconcile.c
   gnucash/trunk/src/import-export/binary-import/druid-commodity.c
   gnucash/trunk/src/import-export/binary-import/druid-commodity.h
   gnucash/trunk/src/import-export/gnc-import-format-gnome.c
   gnucash/trunk/src/import-export/hbci/dialog-daterange.c
   gnucash/trunk/src/import-export/hbci/dialog-daterange.h
   gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.h
   gnucash/trunk/src/import-export/hbci/dialog-pass.c
   gnucash/trunk/src/import-export/hbci/dialog-pass.h
   gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c
   gnucash/trunk/src/import-export/hbci/druid-hbci-utils.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h
   gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c
   gnucash/trunk/src/import-export/hbci/hbci-interaction.c
   gnucash/trunk/src/import-export/hbci/hbci-interaction.h
   gnucash/trunk/src/import-export/hbci/hbci-interactionP.h
   gnucash/trunk/src/import-export/import-account-matcher.c
   gnucash/trunk/src/import-export/import-backend.c
   gnucash/trunk/src/import-export/import-commodity-matcher.c
   gnucash/trunk/src/import-export/import-format-dialog.c
   gnucash/trunk/src/import-export/import-main-matcher.h
   gnucash/trunk/src/import-export/import-settings.c
   gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c
   gnucash/trunk/src/import-export/log-replay/gnc-plugin-log-replay.c
   gnucash/trunk/src/import-export/mt940/gnc-mt940-import.c
   gnucash/trunk/src/import-export/mt940/gnc-plugin-mt940.c
   gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
   gnucash/trunk/src/import-export/ofx/gnc-plugin-ofx.c
   gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
   gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
   gnucash/trunk/src/import-export/qif-import/gnc-plugin-qif-import.c
   gnucash/trunk/src/import-export/qif/qif-defaults.c
   gnucash/trunk/src/import-export/qif/qif-parse.c
   gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c
   gnucash/trunk/src/register/ledger-core/split-register-control.c
   gnucash/trunk/src/register/ledger-core/split-register-layout.c
   gnucash/trunk/src/register/ledger-core/split-register-model.c
   gnucash/trunk/src/register/ledger-core/split-register.c
   gnucash/trunk/src/register/register-core/basiccell.c
   gnucash/trunk/src/register/register-core/quickfillcell.c
   gnucash/trunk/src/register/register-core/table-allgui.c
   gnucash/trunk/src/register/register-gnome/combocell-gnome.c
   gnucash/trunk/src/register/register-gnome/gnucash-style.c
   gnucash/trunk/src/report/report-gnome/dialog-column-view.c
   gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c
   gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
   gnucash/trunk/src/report/report-gnome/window-report.c
   gnucash/trunk/src/report/report-gnome/window-report.h
   gnucash/trunk/src/report/stylesheets/gnc-plugin-stylesheets.c
Log:
Include file cleanup.  Remove the messages.[ch] files in favor of the
glib supplied gi18n.h file.  Replace includes of gnome.h with gtk.h
(or better yet glib.h) wherever possible.  Don't include gnome.h from
any header files.  Remove some extraneous includes.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/ChangeLog	2005-11-19 23:53:34 UTC (rev 11981)
@@ -1,5 +1,11 @@
 2005-11-19  David Hampton  <hampton at employees.org>
 
+	* numerous: Include file cleanup.  Remove the messages.[ch] files
+	in favor of the glib supplied gi18n.h file.  Replace includes of
+	gnome.h with gtk.h (or better yet glib.h) wherever possible.
+	Don't include gnome.h from any header files.  Remove some
+	extraneous includes.
+
 	* src/gnome-utils/gnc-date-format.[ch]: Remove unused function.
 
 2005-11-18  David Hampton  <hampton at employees.org>

Modified: gnucash/trunk/src/app-utils/file-utils.c
===================================================================
--- gnucash/trunk/src/app-utils/file-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/app-utils/file-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <libguile.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
@@ -28,11 +30,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <glib.h>
-#include <libguile.h>
-
 #include "file-utils.h"
-#include "messages.h"
 #include "gnc-engine.h"
 #include "gnc-gkeyfile-utils.h"
  

Modified: gnucash/trunk/src/app-utils/gnc-exp-parser.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-exp-parser.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/app-utils/gnc-exp-parser.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -20,18 +20,17 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <guile/gh.h>
 #include <ctype.h>
 #include <locale.h>
 #include <string.h>
 
-#include <glib.h>
-#include <guile/gh.h>
-
 #include "finproto.h"
 #include "fin_spl_protos.h"
 #include "gnc-gkeyfile-utils.h"
 #include "gnc-exp-parser.h"
-#include "messages.h"
 #include "gnc-ui-util.h"
 #include "guile-mappings.h"
 

Modified: gnucash/trunk/src/app-utils/gnc-gettext-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-gettext-util.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/app-utils/gnc-gettext-util.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -19,11 +19,13 @@
  *
 \********************************************************************/
 
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
-#include <messages.h>
 
 #include "i18n.h"
-
 #include "gnc-gettext-util.h"
 
 /* ============================================================== */

Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,9 +22,10 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <ctype.h>
 #include <errno.h>
-#include <glib.h>
 #include <limits.h>
 #include <locale.h>
 #include <math.h>
@@ -33,8 +34,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "Transaction.h"
-
 #include "Account.h"
 #include "gnc-book.h"
 #include "gnc-component-manager.h"
@@ -45,7 +44,6 @@
 #include "gnc-module.h"
 #include "gnc-ui-util.h"
 #include "Group.h"
-#include "messages.h"
 #include "Transaction.h"
 #include "guile-mappings.h"
 

Modified: gnucash/trunk/src/app-utils/guile-util.c
===================================================================
--- gnucash/trunk/src/app-utils/guile-util.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/app-utils/guile-util.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -20,17 +20,17 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
+#include <g-wrap-wct.h>
+#include <libguile.h>
 
 #include "qof.h"
 #include "engine-helpers.h"
 #include "glib-helpers.h"
 #include "gnc-gconf-utils.h"
 #include "guile-util.h"
-#include "messages.h"
-
-#include <g-wrap-wct.h>
-#include <libguile.h>
 #include "guile-mappings.h"
 
 /* This static indicates the debugging module this .o belongs to.  */

Modified: gnucash/trunk/src/app-utils/option-util.c
===================================================================
--- gnucash/trunk/src/app-utils/option-util.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/app-utils/option-util.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,8 +22,9 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <time.h>
-#include <glib.h>
 #include <string.h>
 
 #include "option-util.h"
@@ -33,7 +34,6 @@
 #include "qof.h"
 #include "gnc-err-popup.h"
 #include "guile-mappings.h"
-#include "messages.h"
 
 #include <g-wrap-wct.h>
 

Modified: gnucash/trunk/src/backend/file/gnc-backend-file.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-backend-file.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/backend/file/gnc-backend-file.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,6 +30,8 @@
 
 #define _GNU_SOURCE
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -49,7 +51,6 @@
 #include "io-gncxml.h"
 #include "io-gncbin.h"
 #include "io-gncxml-v2.h"
-#include "messages.h"
 #include "gnc-backend-api.h"
 #include "gnc-backend-file.h"
 

Modified: gnucash/trunk/src/backend/file/io-gncbin-r.c
===================================================================
--- gnucash/trunk/src/backend/file/io-gncbin-r.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/backend/file/io-gncbin-r.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -86,10 +86,11 @@
  *   nanoseconds ::== signed 32 bit int                             * 
 \********************************************************************/
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
-#include <glib.h>
 
 #include "config.h"
 
@@ -98,7 +99,6 @@
 #include "io-gncbin.h"
 #include "Group.h"
 #include "GroupP.h"
-#include "messages.h"
 #include "Transaction.h"
 #include "TransactionP.h"
 #include "TransLog.h"

Modified: gnucash/trunk/src/backend/postgres/PostgresBackend.c
===================================================================
--- gnucash/trunk/src/backend/postgres/PostgresBackend.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/backend/postgres/PostgresBackend.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,8 +25,9 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <ctype.h>
-#include <glib.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <stdio.h>  
@@ -55,7 +56,6 @@
 #include "events.h"
 #include "gncquery.h"
 #include "kvp-sql.h"
-#include "messages.h"
 #include "PostgresBackend.h"
 #include "price.h"
 #include "txn.h"

Modified: gnucash/trunk/src/backend/postgres/putil.c
===================================================================
--- gnucash/trunk/src/backend/postgres/putil.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/backend/postgres/putil.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -32,12 +32,13 @@
  */
 
 #include <glib.h> 
+#include <glib/gi18n.h>
 #include <libpq-fe.h>  
 #include <stdlib.h>  
 #include <string.h>
+
 #include "qofbackend.h"
 #include "qofbackend-p.h"
-#include "messages.h"
 #include "gnc-engine-util.h" 
 #include "PostgresBackend.h"
 

Modified: gnucash/trunk/src/backend/postgres/upgrade.c
===================================================================
--- gnucash/trunk/src/backend/postgres/upgrade.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/backend/postgres/upgrade.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,12 +25,12 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <libpq-fe.h> 
 #include <stdlib.h>  
-#include <glib.h>
 
 #include "PostgresBackend.h"
-#include "messages.h"
 #include "qofbackend.h"
 #include "upgrade.h"
 

Modified: gnucash/trunk/src/business/business-core/gncBillTerm.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncBillTerm.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncBillTerm.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "messages.h"
 #include "gnc-engine.h"
 #include "gncBillTermP.h"
 

Modified: gnucash/trunk/src/business/business-core/gncCustomer.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncCustomer.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncCustomer.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,7 +31,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include "messages.h"
 #include "gnc-commodity.h"
 
 #include "gncAddressP.h"

Modified: gnucash/trunk/src/business/business-core/gncEmployee.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncEmployee.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncEmployee.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -32,7 +32,6 @@
 #include <string.h>
 
 #include "Account.h"
-#include "messages.h"
 #include "gnc-commodity.h"
 #include "gncAddressP.h"
 #include "gncEmployee.h"

Modified: gnucash/trunk/src/business/business-core/gncEntry.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncEntry.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncEntry.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,7 +29,6 @@
 
 #include <glib.h>
 
-#include "messages.h"
 #include "gnc-commodity.h"
 
 #include "gncEntry.h"

Modified: gnucash/trunk/src/business/business-core/gncInvoice.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncInvoice.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncInvoice.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,10 +30,10 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "Transaction.h"
 #include "Account.h"
-#include "messages.h"
 #include "gncBillTermP.h"
 #include "gncEntry.h"
 #include "gncEntryP.h"

Modified: gnucash/trunk/src/business/business-core/gncJob.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncJob.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncJob.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,7 +31,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include "messages.h"
 #include "gncInvoice.h"
 #include "gncJob.h"
 #include "gncJobP.h"

Modified: gnucash/trunk/src/business/business-core/gncOrder.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncOrder.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncOrder.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -28,8 +28,8 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
-#include "messages.h"
 #include "gncEntry.h"
 #include "gncEntryP.h"
 #include "gncOrder.h"

Modified: gnucash/trunk/src/business/business-core/gncTaxTable.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncTaxTable.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncTaxTable.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "messages.h"
 #include "gncTaxTableP.h"
 
 struct _gncTaxTable 

Modified: gnucash/trunk/src/business/business-core/gncVendor.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncVendor.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/gncVendor.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,7 +31,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include "messages.h"
 #include "gnc-commodity.h"
 #include "gncAddressP.h"
 #include "gncBillTermP.h"

Modified: gnucash/trunk/src/business/business-core/test/test-business.c
===================================================================
--- gnucash/trunk/src/business/business-core/test/test-business.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-core/test/test-business.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -28,7 +28,6 @@
 
 #include "qof.h"
 #include "gnc-module.h"
-#include "messages.h"
 
 #include "gncBusiness.h"
 #include "test-stuff.h"

Modified: gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-gnome-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/business-gnome-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "Group.h"
 #include "Account.h"

Modified: gnucash/trunk/src/business/business-gnome/business-options-gnome.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-options-gnome.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/business-options-gnome.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <g-wrap-wct.h>
 #include <libguile.h>
 

Modified: gnucash/trunk/src/business/business-gnome/business-urls.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-urls.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/business-urls.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-html.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/business/business-gnome/businessmod-gnome.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/businessmod-gnome.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/businessmod-gnome.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,9 +27,10 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <libguile.h>
-#include <glib.h>
 
 #include "gnc-hooks.h"
 #include "gnc-module.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-customer.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-customer.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-customer.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-amount-edit.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-employee.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-employee.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-employee.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-amount-edit.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-job.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-job.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-job.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-order.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-order.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-order.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-payment.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-payment.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-payment.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-vendor.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-vendor.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/dialog-vendor.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-currency-edit.h"

Modified: gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,8 +25,9 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
-#include <gtk/gtk.h>
 #include <libguile.h>
 
 #include "dialog-billterms.h"
@@ -40,7 +41,6 @@
 #include "gnc-plugin-business.h"
 #include "gnc-plugin-page-invoice.h"
 #include "gncOwner.h"
-#include "messages.h"
 #include "gnc-ui-util.h"
 #include "gnc-date.h"
 #include "gnc-file.h"

Modified: gnucash/trunk/src/business/business-gnome/search-owner.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/search-owner.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-gnome/search-owner.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,7 +22,8 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "QueryCore.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedger.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedger.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "dialog-account.h"
@@ -34,7 +35,6 @@
 #include "pricecell.h"
 #include "recncell.h"
 #include "checkboxcell.h"
-#include "messages.h"
 
 #include "gnc-component-manager.h"
 #include "gnc-ui.h"

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "combocell.h"
@@ -34,7 +35,6 @@
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnc-gui-query.h"
-#include "messages.h"
 #include "table-allgui.h"
 #include "pricecell.h"
 #include "dialog-tax-table.h"

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerLayout.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerLayout.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerLayout.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,9 +26,8 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
-#include "messages.h"
-
 #include "gncEntryLedgerP.h"
 #include "gncEntryLedgerLayout.h"
 

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 
 #include "Account.h"
@@ -34,7 +35,6 @@
 #include "gnc-component-manager.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 #include "recncell.h"
 
 #include "business-options.h"

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,8 +26,8 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
-#include "messages.h"
 #include "Account.h"
 #include "gnc-ui-util.h"
 #include "gnc-engine-util.h"	/* for safe_strcmp */

Modified: gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/engine/Account.c
===================================================================
--- gnucash/trunk/src/engine/Account.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/Account.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -35,7 +36,6 @@
 #include "gnc-lot.h"
 #include "gnc-lot-p.h"
 #include "gnc-pricedb.h"
-#include "messages.h"
 #include "policy.h"
 
 static QofLogModule log_module = GNC_MOD_ACCOUNT;

Modified: gnucash/trunk/src/engine/FreqSpec.c
===================================================================
--- gnucash/trunk/src/engine/FreqSpec.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/FreqSpec.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -74,17 +74,17 @@
 \********************************************************************/
 
 #include "config.h"
-#include <time.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
+#include <time.h>
 
 #ifdef HAVE_LANGINFO_D_FMT
 #include <langinfo.h>
 #endif
 
 #include "FreqSpecP.h"
-#include "messages.h"
 
 static QofLogModule log_module = GNC_MOD_SX;
 /* 

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/Makefile.am	2005-11-19 23:53:34 UTC (rev 11981)
@@ -39,7 +39,6 @@
   gnc-pricedb.c \
   gnc-session-scm.c \
   gncmod-engine.c \
-  messages.c \
   policy.c
 
 EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c
@@ -80,7 +79,6 @@
   gnc-session-scm.h \
   gncObject.h \
   kvp-scm.h \
-  messages.h \
   policy.h
 
 noinst_HEADERS = \

Modified: gnucash/trunk/src/engine/SchedXaction.c
===================================================================
--- gnucash/trunk/src/engine/SchedXaction.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/SchedXaction.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "FreqSpec.h"
@@ -34,7 +35,6 @@
 #include "SchedXactionP.h"
 #include "Transaction.h"
 #include "gnc-engine.h"
-#include "messages.h"
 
 static QofLogModule log_module = GNC_MOD_SX;
 

Modified: gnucash/trunk/src/engine/Scrub.c
===================================================================
--- gnucash/trunk/src/engine/Scrub.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/Scrub.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -38,6 +38,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -49,7 +50,6 @@
 #include "ScrubP.h"
 #include "Transaction.h"
 #include "TransactionP.h"
-#include "messages.h"
 #include "gnc-commodity.h"
 
 static QofLogModule log_module = GNC_MOD_SCRUB;

Modified: gnucash/trunk/src/engine/Scrub2.c
===================================================================
--- gnucash/trunk/src/engine/Scrub2.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/Scrub2.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -46,7 +46,6 @@
 #include "gnc-engine.h"
 #include "gnc-lot.h"
 #include "gnc-lot-p.h"
-#include "messages.h"
 #include "policy-p.h"
 
 static QofLogModule log_module = GNC_MOD_LOT;

Modified: gnucash/trunk/src/engine/Transaction.c
===================================================================
--- gnucash/trunk/src/engine/Transaction.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/Transaction.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -42,7 +44,6 @@
 #include "gnc-engine.h"
 #include "gnc-lot-p.h"
 #include "gnc-lot.h"
-#include "messages.h"
 
 /*
  * Design notes on event-generation: transaction-modified-events 

Modified: gnucash/trunk/src/engine/cap-gains.c
===================================================================
--- gnucash/trunk/src/engine/cap-gains.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/cap-gains.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -56,6 +56,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "AccountP.h"
@@ -69,7 +70,6 @@
 #include "gnc-engine.h"
 #include "gnc-lot.h"
 #include "gnc-lot-p.h"
-#include "messages.h"
 #include "policy.h"
 #include "policy-p.h"
 

Modified: gnucash/trunk/src/engine/gnc-commodity.c
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/gnc-commodity.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,16 +26,16 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <regex.h>
 
 #include "gnc-commodity.h"
-#include "messages.h"
 
 static QofLogModule log_module = GNC_MOD_COMMODITY; 
 

Deleted: gnucash/trunk/src/engine/messages.c
===================================================================
--- gnucash/trunk/src/engine/messages.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/messages.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -1,101 +0,0 @@
-/********************************************************************\
- * messages.c -- national-language messages for GnuCash             *
- * Copyright (C) 2001 Christian Stimming                            *
- *                                                                  *
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, write to the Free Software      *
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        *
-\********************************************************************/
-
-#include "config.h"
-
-#include <glib.h>
-#include <string.h>
-
-#include "messages.h"
-
-/* Prefix marker and end-of-prefix marker for i18n messages with
-   qualifying prefix, see
-   e.g. http://mail.gnome.org/archives/gnome-i18n/2001-April/msg00058.html. 
-
-   Adapted from a patch posted to gnome-devel-list on Dec 6, 2000, by
-   Zbigniew Chyla <cyba at piast.t19.ds.pwr.wroc.pl>
-*/
-#define Q_PREFIX_START '|'
-#define Q_PREFIX_END   '|'
-
-/***
- * gnc_qualifier_prefix_gettext
- **/
-const gchar *
-gnc_qualifier_prefix_gettext (const gchar *string)
-{
-        g_return_val_if_fail (string, NULL);
-
-	if (*string != Q_PREFIX_START) {
-		return gettext (string);
-	} else {
-		const gchar *translation;
-
-		translation = gettext (string);
-		if (translation != string) {
-			if (*translation != Q_PREFIX_START) {
-				return translation;
-			} else {
-				const gchar *real_translation;
-
-				real_translation = strchr (translation + 1, Q_PREFIX_END);
-				if (real_translation != NULL) {
-					return real_translation + 1;
-				} else {
-					g_warning ("Ivalid Q_() translation: \"%s\"", translation);
-					return translation;
-				}
-			}
-		} else {
-			gchar *real_string;
-
-			real_string = strchr (string + 1, Q_PREFIX_END);
-			if (real_string != NULL) {
-				return gettext (real_string + 1);
-			} else {
-				g_warning ("Invalid Q_() string: \"%s\"", string);
-				return (gchar *) string;
-			}
-		}
-	}
-}
-
-
-/***
- * gnc_qualifier_prefix_noop
- **/
-gchar *
-gnc_qualifier_prefix_noop (const gchar *string)
-{
-	g_return_val_if_fail (string, NULL);
-
-	if (*string != Q_PREFIX_START) {
-		return (gchar *) string;
-	} else {
-		gchar *real_string;
-
-		real_string = strchr (string + 1, Q_PREFIX_END);
-		if (real_string != NULL) {
-			return real_string + 1;
-		} else {
-			g_warning ("Invalid Q_() string: \"%s\"", string);
-			return (gchar *) string;
-		}
-	}
-}

Deleted: gnucash/trunk/src/engine/messages.h
===================================================================
--- gnucash/trunk/src/engine/messages.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/messages.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -1,66 +0,0 @@
-/********************************************************************\
- * messages.h -- national-language messages for GnuCash             *
- * Copyright (C) 1997 Robin D. Clark                                *
- * Copyright (C) 1997, 1998 Linas Vepstas                           *
- * Copyright (C) 2000 Dave Peticolas                                *
- *                                                                  *
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, write to the Free Software      *
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        *
-\********************************************************************/
-
-/** @file messages.h @brief National-language messages for GnuCash     */
-
-#ifndef XACC_MESSAGES_H
-#define XACC_MESSAGES_H
-
-#include "config.h"
-
-const char *gnc_qualifier_prefix_gettext (const char *s);
-char *gnc_qualifier_prefix_noop (const char *s);
-
-#if defined(HAVE_GETTEXT)             /* HAVE_GETTEXT */
-
-#include <libintl.h>
-#include <locale.h>
-
-#undef _
-#undef Q_
-
-#ifdef DISABLE_GETTEXT_UNDERSCORE
-#define _(String) (String)
-#define Q_(String) gnc_qualifier_prefix_noop(String)
-#else                                 /* ENABLE_GETTEXT_UNDERSCORE */
-#define _(String) gettext(String)
-#define Q_(String) gnc_qualifier_prefix_gettext(String)
-#endif		                      /* End ENABLE_GETTEXT_UNDERSCORE */
-
-#else                                 /* Not HAVE_GETTEXT */
-#if !defined(__USE_GNU_GETTEXT)
-
-#undef _
-#undef Q_
-
-#define _(String)       (String)
-#define Q_(String) gnc_qualifier_prefix_noop(String)
-#define gettext(String) (String)
-#define ngettext(msgid, msgid_plural, n) (((n)==1) ? \
-                                            (msgid) : (msgid_plural))
-
-#endif                                /* End not__USE_GNU_GETTEXT */
-#endif                                /* End Not HAVE_GETTEXT */
-
-#undef  N_
-#define N_(String) (String)
-
-#endif /* XACC_MESSAGES_H */

Modified: gnucash/trunk/src/engine/test/test-object.c
===================================================================
--- gnucash/trunk/src/engine/test/test-object.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/test/test-object.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,9 +24,9 @@
  * Lightly test the QofObject infrastructure.
  */
 #include <glib.h>
+#include <glib/gi18n.h>
 #include "qof.h"
 #include "cashobjects.h"
-#include "messages.h"
 #include "test-stuff.h"
 
 #define TEST_MODULE_NAME "object-test"

Modified: gnucash/trunk/src/engine/test/test-querynew.c
===================================================================
--- gnucash/trunk/src/engine/test/test-querynew.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/engine/test/test-querynew.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,7 +26,6 @@
 #include "qof.h"
 #include "guid.h"
 #include "gnc-engine-util.h"
-#include "messages.h"
 #include "cashobjects.h"
 #include "test-stuff.h"
 

Modified: gnucash/trunk/src/gnome/dialog-chart-export.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-chart-export.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-chart-export.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,10 @@
  *  02110-1301, USA.
  */
  
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <time.h>
+
 #include "qof.h"
 #include "AccountP.h"
 #include "Transaction.h"

Modified: gnucash/trunk/src/gnome/dialog-chart-export.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-chart-export.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-chart-export.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,8 +26,6 @@
 #ifndef _DIALOG_CHART_EXPORT_H
 #define _DIALOG_CHART_EXPORT_H
 
-#include <gnome.h>
-
 #define _GNU_SOURCE
 
 

Modified: gnucash/trunk/src/gnome/dialog-commodities.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-commodities.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-commodities.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-commodity.h"
 #include "dialog-utils.h"
@@ -36,7 +37,6 @@
 #include "gnc-ui-util.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-gnome-utils.h"
-#include "messages.h"
 
 
 #define DIALOG_COMMODITIES_CM_CLASS "dialog-commodities"

Modified: gnucash/trunk/src/gnome/dialog-fincalc.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-fincalc.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-fincalc.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <locale.h>
 #include <time.h>
 
@@ -36,7 +37,6 @@
 #include "gnc-date-edit.h"
 #include "gnc-engine.h"
 #include "gnc-gui-query.h"
-#include "messages.h"
 
 
 #define DIALOG_FINCALC_CM_CLASS "dialog-fincalc"

Modified: gnucash/trunk/src/gnome/dialog-fincalc.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-fincalc.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-fincalc.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#include <gnome.h>
-
 typedef struct _FinCalcDialog FinCalcDialog;
 
 void gnc_ui_fincalc_dialog_create(void);

Modified: gnucash/trunk/src/gnome/dialog-find-transactions.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-find-transactions.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-find-transactions.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 
 #include "gnc-ui-util.h"
@@ -37,7 +38,6 @@
 #include "dialog-find-transactions.h"
 #include "gnc-main-window.h"
 #include "gnc-plugin-page-register.h"
-#include "messages.h"
 #include "search-param.h"
 
 #define GCONF_SECTION "dialogs/find"

Modified: gnucash/trunk/src/gnome/dialog-find-transactions.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-find-transactions.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-find-transactions.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,8 +24,6 @@
 #ifndef DIALOG_FIND_TRANSACTIONS_H
 #define DIALOG_FIND_TRANSACTIONS_H
 
-#include <gnome.h>
-
 #include "gnc-ledger-display.h"
 #include "dialog-search.h"
 

Modified: gnucash/trunk/src/gnome/dialog-new-user.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-new-user.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-new-user.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 
 #include "dialog-new-user.h"

Modified: gnucash/trunk/src/gnome/dialog-price-edit-db.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-edit-db.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-price-edit-db.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 #include <time.h>
 
@@ -42,7 +43,6 @@
 #include "gnc-ui-util.h"
 #include "guile-util.h"
 #include "engine-helpers.h"
-#include "messages.h"
 
 
 #define DIALOG_PRICE_DB_CM_CLASS "dialog-price-edit-db"

Modified: gnucash/trunk/src/gnome/dialog-price-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-editor.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-price-editor.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <time.h>
 
 #include "dialog-utils.h"
@@ -39,7 +40,6 @@
 #include "gnc-ui-util.h"
 #include "guile-util.h"
 #include "engine-helpers.h"
-#include "messages.h"
 
 
 #define DIALOG_PRICE_EDIT_CM_CLASS "dialog-price-edit"

Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-print-check.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,12 +24,12 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
-#include <gnome.h>
 #include <libguile.h>
 
 #include "gnc-date.h"
-#include "messages.h"
 #include "gnc-numeric.h"
 #include "gnc-plugin-page-register.h"
 #include "dialog-print-check.h"

Modified: gnucash/trunk/src/gnome/dialog-print-check.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-print-check.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <gnome.h>
 #include <libguile.h>
 
 #include "print-session.h"

Modified: gnucash/trunk/src/gnome/dialog-progress.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-progress.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-progress.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 #include "guile-mappings.h"
 
 #include "dialog-progress.h"
 #include "dialog-utils.h"
-#include "messages.h"
 
 
 struct _GNCProgressDialog

Modified: gnucash/trunk/src/gnome/dialog-scheduledxaction.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-scheduledxaction.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-scheduledxaction.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <locale.h>
 #include <time.h>
 
@@ -51,7 +52,6 @@
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnucash-sheet.h"
-#include "messages.h"
 
 #include "gnc-split-reg.h"
 

Modified: gnucash/trunk/src/gnome/dialog-scheduledxaction.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-scheduledxaction.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-scheduledxaction.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,8 +23,6 @@
 #ifndef DIALOG_SCHEDULEDXACTION_H
 #define DIALOG_SCHEDULEDXACTION_H
 
-#include "config.h"
-#include <gnome.h>
 #include "SchedXaction.h"
 
 #define DIALOG_SCHEDXACTION_CM_CLASS "dialog-scheduledtransactions"

Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-engine.h"
 #include "SX-book.h"

Modified: gnucash/trunk/src/gnome/dialog-sxsincelast.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sxsincelast.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-sxsincelast.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -49,9 +49,9 @@
 
 #include "config.h"
 
-#include <limits.h>
 #include <gnome.h>
-#include <glib.h>
+#include <glib/gi18n.h>
+#include <limits.h>
 
 #include "Account.h"
 #include "Group.h"
@@ -81,7 +81,6 @@
 #include "gnc-ledger-display.h"
 #include "gnucash-sheet.h"
 #include "gnc-split-reg.h"
-#include "messages.h"
 
 #include "dialog-sxsincelast.h"
 #include "dialog-scheduledxaction.h"

Modified: gnucash/trunk/src/gnome/dialog-tax-info.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-tax-info.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-tax-info.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <libguile.h>
 
 #include "Account.h"
@@ -33,7 +33,6 @@
 #include "gnc-component-manager.h"
 #include "gnc-engine-util.h"
 #include "gnc-ui.h"
-#include "messages.h"
 
 
 #define DIALOG_TAX_INFO_CM_CLASS "dialog-tax-info"

Modified: gnucash/trunk/src/gnome/dialog-totd.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-totd.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/dialog-totd.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glade/glade-xml.h>
 
 #include "dialog-totd.h"
@@ -31,7 +32,6 @@
 #include "gnc-gconf-utils.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-engine.h"
-#include "messages.h"
 
 
 #define GCONF_SECTION   "dialogs/tip_of_the_day"

Modified: gnucash/trunk/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/druid-acct-period.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/druid-acct-period.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,9 +24,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <gnome.h>
-#include <libgnomeui/gnome-window-icon.h>
+#include <glib/gi18n.h>
 
 #include "FreqSpec.h"
 #include "Group.h"
@@ -47,7 +46,6 @@
 #include "gnc-trace.h"
 #include "gnc-ui-util.h"
 #include "misc-gnome-utils.h"
-#include "messages.h"
 #include "qof.h"
 
 

Modified: gnucash/trunk/src/gnome/druid-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/druid-hierarchy.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/druid-hierarchy.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <libgnomeui/gnome-window-icon.h>
 
 #include "Group.h"
 #include "dialog-new-user.h"

Modified: gnucash/trunk/src/gnome/druid-loan.c
===================================================================
--- gnucash/trunk/src/gnome/druid-loan.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/druid-loan.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,13 +23,10 @@
 
 #include "config.h"
 
+#include <gnome.h>
 #include <string.h>
-#include <gtk/gtk.h>
-#include <glib.h>
 #include <glade/glade.h>
-#include <gnome.h>
 #include <math.h>
-#include <libgnomeui/gnome-window-icon.h>
 
 #include "druid-loan.h"
 

Modified: gnucash/trunk/src/gnome/druid-merge.c
===================================================================
--- gnucash/trunk/src/gnome/druid-merge.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/druid-merge.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <libgnomeui/gnome-window-icon.h>
 
 #include "dialog-utils.h"
 #include "druid-merge.h"

Modified: gnucash/trunk/src/gnome/druid-stock-split.c
===================================================================
--- gnucash/trunk/src/gnome/druid-stock-split.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/druid-stock-split.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <gnome.h>
-#include <libgnomeui/gnome-window-icon.h>
 
 #include "Group.h"
 #include "Transaction.h"
@@ -42,7 +41,6 @@
 #include "gnc-tree-view-account.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 
 #define DRUID_STOCK_SPLIT_CM_CLASS "druid-stock-split"

Modified: gnucash/trunk/src/gnome/gnc-plugin-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-account-tree.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-account-tree.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -33,13 +33,13 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "gnc-plugin-account-tree.h"
 #include "gnc-plugin-page-account-tree.h"
 
-#include "messages.h"
-
 static void gnc_plugin_account_tree_class_init (GncPluginAccountTreeClass *klass);
 static void gnc_plugin_account_tree_init (GncPluginAccountTree *plugin);
 static void gnc_plugin_account_tree_finalize (GObject *object);

Modified: gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,6 +31,9 @@
 */
 
 #include "config.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "gnc-plugin-basic-commands.h"
@@ -49,7 +52,6 @@
 #include "gnc-gui-query.h"
 #include "gnc-ui.h"
 #include "gnc-window.h"
-#include "messages.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_GUI;

Modified: gnucash/trunk/src/gnome/gnc-plugin-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-budget.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-budget.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "gnc-plugin-budget.h"
@@ -34,8 +36,6 @@
 #include "gnc-ui.h"
 #include "gnc-component-manager.h"
 
-#include "messages.h"
-
 #define PLUGIN_ACTIONS_NAME "gnc-plugin-budget-actions"
 #define PLUGIN_UI_FILENAME  "gnc-plugin-budget-ui.xml"
 

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -35,6 +35,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #ifndef HAVE_GLIB26
 #include "gkeyfile.h"
 #endif
@@ -48,6 +49,7 @@
 #include "dialog-transfer.h"
 #include "druid-merge.h"
 #include "gnc-component-manager.h"
+#include "gnc-engine.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-html.h"
 #include "gnc-icons.h"
@@ -62,9 +64,6 @@
 #include "window-reconcile.h"
 #include "window-main-summarybar.h"
 
-#include "messages.h"
-#include "gnc-engine.h"
-
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_GUI;
 

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -61,7 +61,6 @@
 #include "gnc-main-window.h"
 #include "gnc-component-manager.h"
 
-#include "messages.h"
 #include "gnc-engine-util.h"
 #include "gnc-date.h"
 #include "gnc-trace.h"

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-register.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-register.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -55,6 +55,7 @@
 #include "gnc-component-manager.h"
 #include "gnc-date.h"
 #include "gnc-date-edit.h"
+#include "gnc-engine.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-gobject-utils.h"
 #include "gnc-gui-query.h"
@@ -69,8 +70,6 @@
 #include "window-reconcile.h"
 #include "window-report.h"
 
-#include "messages.h"
-#include "gnc-engine.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_GUI;

Modified: gnucash/trunk/src/gnome/gnc-plugin-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-register.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-plugin-register.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 #include "gnc-plugin-register.h"
 #include "gnc-plugin-page-register.h"
 
-#include "messages.h"
 
 static void gnc_plugin_register_class_init (GncPluginRegisterClass *klass);
 static void gnc_plugin_register_init (GncPluginRegister *plugin);

Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,7 +29,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <time.h>
 
 #include "gnc-split-reg.h"
@@ -52,7 +53,6 @@
 #include "gnc-ui-util.h"
 #include "gnc-ui.h"
 #include "gnucash-sheet.h"
-#include "messages.h"
 #include "table-allgui.h"
 
 #include <libguile.h>

Modified: gnucash/trunk/src/gnome/lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/lot-viewer.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/lot-viewer.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -39,9 +39,8 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <gnome.h>
-#include <libgnomeui/gnome-window-icon.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "cap-gains.h"
@@ -49,7 +48,6 @@
 #include "gnc-date.h"
 #include "gnc-event.h"
 #include "gnc-lot.h"
-#include "messages.h"
 #include "Scrub3.h"
 #include "Transaction.h"
 

Modified: gnucash/trunk/src/gnome/reconcile-list.c
===================================================================
--- gnucash/trunk/src/gnome/reconcile-list.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/reconcile-list.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,17 +24,15 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-date.h"
 #include "QueryCore.h"
 #include "QueryNew.h"
 #include "Transaction.h"
-
-#include "dialog-utils.h"
 #include "gnc-ui-util.h"
 #include "gnc-gconf-utils.h"
-#include "messages.h"
 #include "reconcile-list.h"
 #include "search-param.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/gnome/top-level.c
===================================================================
--- gnucash/trunk/src/gnome/top-level.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/top-level.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 #include <popt.h>
 #include <stdlib.h>
@@ -39,7 +40,6 @@
 #include "dialog-scheduledxaction.h"
 #include "dialog-transfer.h"
 #include "dialog-totd.h"
-#include "dialog-utils.h"
 #include "druid-hierarchy.h"
 #include "file-utils.h"
 #include "gnc-component-manager.h"
@@ -70,7 +70,6 @@
 #include "gnucash-sheet.h"
 #include "gnucash-style.h"
 #include "guile-util.h"
-#include "messages.h"
 #include "top-level.h"
 #include "window-report.h"
 

Modified: gnucash/trunk/src/gnome/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome/window-main-summarybar.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/window-main-summarybar.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,23 +25,17 @@
 
 #include "config.h"
 
-#include <gnome.h>
-#include <string.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "Group.h"
-#include "dialog-utils.h"
 #include "gnc-accounting-period.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
 #include "gnc-euro.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui-util.h"
-#include "gnc-ui.h"
-#include "messages.h"
-#include "option-util.h"
 #include "qofbook.h"
-#include "top-level.h"
 #include "window-main-summarybar.h"
 
 typedef struct {

Modified: gnucash/trunk/src/gnome/window-main-summarybar.h
===================================================================
--- gnucash/trunk/src/gnome/window-main-summarybar.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/window-main-summarybar.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,8 +24,6 @@
 #ifndef WINDOW_MAIN_SUMMARYBAR_H
 #define WINDOW_MAIN_SUMMARYBAR_H
 
-#include <gnome.h>
-
 GtkWidget * gnc_main_window_summary_new(void);
 
 #endif

Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome/window-reconcile.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -32,33 +32,24 @@
 #include "config.h"
 
 #include <gnome.h>
-#include <stdio.h>
-#include <time.h>
-#include <libgnomeui/gnome-window-icon.h>
-
+#include <glib/gi18n.h>
+//#include <stdio.h>
+//#include <time.h>
+//
 #include "Scrub.h"
 #include "dialog-account.h"
 #include "dialog-transfer.h"
 #include "dialog-utils.h"
-#include "dialog-transfer.h"
 #include "gnc-amount-edit.h"
 #include "gnc-component-manager.h"
-#include "gnc-date.h"
 #include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
 #include "gnc-gconf-utils.h"
-#include "gnc-gui-query.h"
-#include "gnc-ledger-display.h"
 #include "gnc-main-window.h"
-#include "gnc-plugin-page.h"
 #include "gnc-plugin-page-register.h"
-#include "gnc-ui-util.h"
 #include "gnc-ui.h"
 #include "guile-util.h"
-#include "messages.h"
 #include "reconcile-list.h"
 #include "window-reconcile.h"
-#include "top-level.h"
 
 #define WINDOW_RECONCILE_CM_CLASS "window-reconcile"
 

Modified: gnucash/trunk/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/dialog-search.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/gnome-search/gncmod-gnome-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/gncmod-gnome-search.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/gncmod-gnome-search.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,8 +26,8 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
 #include <stdio.h>
-#include <glib.h>
 #include <libguile.h>
 
 #include "gnc-module.h"

Modified: gnucash/trunk/src/gnome-search/search-account.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-account.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-account.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "QueryCore.h"

Modified: gnucash/trunk/src/gnome-search/search-boolean.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-boolean.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-boolean.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "QueryCore.h"
 

Modified: gnucash/trunk/src/gnome-search/search-core-type.h
===================================================================
--- gnucash/trunk/src/gnome-search/search-core-type.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-core-type.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -21,7 +21,6 @@
 #ifndef _GNCSEARCH_CORE_TYPE_H
 #define _GNCSEARCH_CORE_TYPE_H
 
-#include <gnome.h>
 #include "QueryCore.h"
 #include "QueryNew.h"
 #include "search-param.h"

Modified: gnucash/trunk/src/gnome-search/search-date.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-date.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-date.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-date.h"
 #include "gnc-date-edit.h"

Modified: gnucash/trunk/src/gnome-search/search-double.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-double.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-double.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-amount-edit.h"
 #include "QueryCore.h"

Modified: gnucash/trunk/src/gnome-search/search-int64.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-int64.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-int64.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-amount-edit.h"
 #include "QueryCore.h"

Modified: gnucash/trunk/src/gnome-search/search-numeric.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-numeric.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-numeric.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-amount-edit.h"
 #include "QueryCore.h"

Modified: gnucash/trunk/src/gnome-search/search-reconciled.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-reconciled.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-reconciled.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "QueryCore.h"
 #include "Transaction.h"	/* for ?REC */

Modified: gnucash/trunk/src/gnome-search/search-string.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-string.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-search/search-string.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,10 +22,11 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <sys/types.h>
 #include <regex.h>
-#include <gtk/gtk.h>
 
 #include "search-string.h"
 #include "QueryCore.h"

Modified: gnucash/trunk/src/gnome-utils/QuickFill.c
===================================================================
--- gnucash/trunk/src/gnome-utils/QuickFill.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/QuickFill.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "QuickFill.h"
-#include "dialog-utils.h"
 #include "gnc-engine.h"
 #include "gnc-engine.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/gnome-utils/cursors.c
===================================================================
--- gnucash/trunk/src/gnome-utils/cursors.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/cursors.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include "gnc-ui.h"
 

Modified: gnucash/trunk/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-account.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-account.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <math.h>
 #include <string.h>
 
@@ -43,7 +44,6 @@
 #include "gnc-tree-view-account.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 
 #define DIALOG_NEW_ACCOUNT_CM_CLASS "dialog-new-account"

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -33,7 +33,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 
 #include "dialog-commodity.h"
@@ -42,7 +43,6 @@
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
 #include "gnc-ui.h"
-#include "messages.h"
 
 static QofLogModule log_module = GNC_MOD_GUI;
 

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -33,8 +33,6 @@
 #ifndef GNC_DIALOG_COMMODITY_H
 #define GNC_DIALOG_COMMODITY_H
 
-#include <gnome.h>
-
 #include "gnc-commodity.h"
 
 /** The dialog commodity types are used to determine what commodity

Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -44,7 +44,6 @@
 #include "gnc-gui-query.h"
 #include "gnc-ui.h"
 #include "guile-util.h"
-#include "messages.h"
 #include "option-util.h"
 #include "gdk/gdkfont.h"
 #include "guile-mappings.h"

Modified: gnucash/trunk/src/gnome-utils/dialog-options.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-options.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,11 +23,6 @@
 #ifndef OPTIONS_DIALOG_H
 #define OPTIONS_DIALOG_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
 #include <libguile.h>
 
 #include "option-util.h"

Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,6 +25,8 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 #include "dialog-transfer.h"
 #include "dialog-utils.h"
@@ -40,7 +42,6 @@
 #include "gnc-pricedb.h"
 #include "gnc-tree-view-account.h"
 #include "gnc-ui.h"
-#include "messages.h"
 #include "Transaction.h"
 #include "Account.h"
 

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,14 +27,12 @@
 
 #include "config.h"
 
-#include <glade/glade.h>
 #include <gnome.h>
-#include <gmodule.h>
+#include <glade/glade.h>
 #include <dlfcn.h>
 
 #include "dialog-utils.h"
 #include "gnc-commodity.h"
-#include "messages.h"
 #include "Group.h"
 #include "gnc-dir.h"
 #include "gnc-engine.h"

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,10 +27,8 @@
 #define DIALOG_UTILS_H
 
 #include <glade/glade.h>
-#include <gnome.h> 
-#include "Account.h"
+#include "qof.h"
 
-
 /* option button callback function */
 typedef void (*GNCOptionCallback) (GtkWidget *, gint index,
                                    gpointer user_data);
@@ -88,7 +86,9 @@
  *       data - the value to fill with                              *
  * Returns: nothing                                                 *
 \********************************************************************/
+#ifdef LIBGNOME_H
 void gnc_fill_menu_with_data (GnomeUIInfo *info, gpointer data);
+#endif
 
 void gnc_option_menu_init (GtkWidget * option_menu);
 void gnc_option_menu_init_w_signal(GtkWidget * w,

Modified: gnucash/trunk/src/gnome-utils/druid-gconf-setup.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-gconf-setup.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/druid-gconf-setup.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -32,9 +32,10 @@
 
 #include "config.h"
 
+#include <gnome.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <gnome.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -46,7 +47,6 @@
 #include "gnc-gui-query.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-ui.h"
-#include "messages.h"
 
 #define WHO_DOES		"who_does"
 #define WHO_GNUCASH		1

Modified: gnucash/trunk/src/gnome-utils/druid-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/druid-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include <gnome.h>
+
 #include "dialog-utils.h"
 #include "druid-utils.h"
 #include "gnc-engine-util.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-account-sel.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,11 +24,13 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "dialog-account.h"
 #include "GNCId.h"
 #include "gnc-account-sel.h"
 #include "gnc-exp-parser.h"
-#include "messages.h"
 #include "gnc-ui-util.h"
 #include "gnc-engine-util.h"
 #include "gnc-event.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-account-sel.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-account-sel.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-account-sel.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 #ifndef GNC_ACCOUNT_SEL_H
 #define GNC_ACCOUNT_SEL_H
 
-#include <gnome.h>
 #include "Account.h"
 
 #define GNC_TYPE_ACCOUNT_SEL          (gnc_account_sel_get_type())	

Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -34,9 +34,11 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "gnc-amount-edit.h"
 #include "gnc-exp-parser.h"
-#include "messages.h"
 #include "gnc-ui-util.h"
 #include "gnc-engine-util.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,8 +29,6 @@
 #ifndef GNC_AMOUNT_EDIT_H
 #define GNC_AMOUNT_EDIT_H 
 
-#include <gnome.h>
-
 #include "gnc-numeric.h"
 #include "gnc-ui-util.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-commodity-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-commodity-edit.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-commodity-edit.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -33,8 +33,10 @@
  * 	    Derek Atkins <warlord at MIT.EDU>
  */
 
-#include <config.h>
+#include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "dialog-commodity.h"
 #include "gnc-commodity-edit.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-commodity-edit.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-commodity-edit.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-commodity-edit.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -32,7 +32,6 @@
 #ifndef GNC_COMMODITY_EDIT_H
 #define GNC_COMMODITY_EDIT_H
 
-#include <gnome.h>
 #include "gnc-commodity.h"
 
 /* Callback function to return the printable string of a commodity */

Modified: gnucash/trunk/src/gnome-utils/gnc-currency-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-currency-edit.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-currency-edit.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -55,7 +55,9 @@
  *  user from typing in random data.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <gtk/gtk.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -63,7 +65,6 @@
 #include "gnc-currency-edit.h"
 #include "gnc-commodity.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 static void gnc_currency_edit_init         (GNCCurrencyEdit      *gce);
 static void gnc_currency_edit_class_init   (GNCCurrencyEditClass *class);

Modified: gnucash/trunk/src/gnome-utils/gnc-currency-edit.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-currency-edit.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-currency-edit.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -55,8 +55,6 @@
 #ifndef GNC_CURRENCY_EDIT_H
 #define GNC_CURRENCY_EDIT_H
 
-#include <gnome.h>
-
 #include "gnc-commodity.h"
 
 /** @name Basic Object Implementation */

Modified: gnucash/trunk/src/gnome-utils/gnc-date-delta.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-delta.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-date-delta.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -34,6 +34,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h> /* atoi */
 #include <ctype.h> /* isdigit */
@@ -41,7 +43,6 @@
 
 #include "gnc-date.h"
 #include "gnc-date-delta.h"
-#include "messages.h"
 
 
 enum

Modified: gnucash/trunk/src/gnome-utils/gnc-date-delta.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-delta.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-date-delta.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,8 +31,6 @@
 #ifndef GNC_DATE_DELTA_H
 #define GNC_DATE_DELTA_H 
 
-#include <gnome.h>
-
 typedef enum {
   GNC_DATE_DELTA_DAYS,
   GNC_DATE_DELTA_WEEKS,

Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -35,6 +35,7 @@
 
 #include "config.h"
 
+#include <gnome.h> 
 #include <string.h>
 #include <stdlib.h> /* atoi */
 #include <ctype.h> /* isdigit */
@@ -44,7 +45,6 @@
 #include "gnc-date.h"
 #include "dialog-utils.h"
 #include "gnc-date-edit.h"
-#include "messages.h"
 
 
 enum {

Modified: gnucash/trunk/src/gnome-utils/gnc-date-format.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-format.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-date-format.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -34,6 +34,7 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdio.h>
 

Modified: gnucash/trunk/src/gnome-utils/gnc-date-format.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-format.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-date-format.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,8 +29,6 @@
 #ifndef GNC_DATE_FORMAT_H
 #define GNC_DATE_FORMAT_H 
 
-#include <gnome.h>
-#include <glib.h>
 #include "gnc-date.h"
 
 #define GNC_TYPE_DATE_FORMAT         (gnc_date_format_get_type ())

Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,12 +22,10 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <math.h>
-#include <time.h>
-#include <string.h>
 #include <gtk/gtk.h>
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <math.h>
+
 #include "gnc-dense-cal.h"
 
 /* For PERR, only... */

Modified: gnucash/trunk/src/gnome-utils/gnc-dialog.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dialog.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-dialog.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -26,6 +26,7 @@
 #include "gnc-dialog.h"
 #include "gnc-gobject-utils.h"
 #include "dialog-utils.h"  // for gnc_glade_xml_new
+#include "gnc-engine.h"
 
 static QofLogModule log_module = GNC_MOD_GUI;
 

Modified: gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-file-gnome.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -1,13 +1,16 @@
 
 
 #include "config.h"
+
+#include <gnome.h>
+#include <glib/gi18n.h>
+
 #include "gnc-druid-gnome-ui.h"
 #include "gnc-druid-provider-file-gnome.h"
 #include "gnc-druid-provider-desc-file.h"
 
 #include "gnc-basic-gobject.h"
 
-#include "messages.h"
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-druid-provider-multifile-gnome.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -8,7 +8,6 @@
 
 #include "gnc-basic-gobject.h"
 #include "dialog-utils.h"
-#include "messages.h"
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-embedded-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-embedded-window.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-embedded-window.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -38,7 +38,6 @@
 #include "gnc-plugin-manager.h"
 #include "gnc-ui.h"
 #include "gnc-window.h"
-#include "messages.h"
 
 /* Static Globals *******************************************************/
 

Modified: gnucash/trunk/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-file.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <glib.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <errno.h>
 #include <libguile.h>
 #include <string.h>
 #include <g-wrap-wct.h>
@@ -43,7 +43,6 @@
 #include "gnc-gconf-utils.h"
 #include "gnc-plugin-file-history.h"
 #include "qof.h"
-#include "messages.h"
 #include "TransLog.h"
 
 #define GCONF_SECTION "dialogs/export_accounts"

Modified: gnucash/trunk/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-frequency.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-frequency.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <math.h>
 #include <time.h>
 

Modified: gnucash/trunk/src/gnome-utils/gnc-frequency.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-frequency.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-frequency.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,10 +25,8 @@
 #ifndef GNC_FREQUENCY_H
 #define GNC_FREQUENCY_H
 
-#include <gnome.h>
 #include "gnc-date-edit.h"
 #include "FreqSpec.h"
-#include "dialog-utils.h"
 
 #define GNC_TYPE_FREQUENCY	  (gnc_frequency_get_type())
 #define GNC_FREQUENCY(obj)	  G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_FREQUENCY, GNCFrequency)

Modified: gnucash/trunk/src/gnome-utils/gnc-general-select.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-general-select.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-general-select.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -28,7 +28,10 @@
   @NOTATION@
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>

Modified: gnucash/trunk/src/gnome-utils/gnc-general-select.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-general-select.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-general-select.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,9 +31,6 @@
 #ifndef GNC_GENERAL_SELECT_H
 #define GNC_GENERAL_SELECT_H
 
-#include <gnome.h>
-#include <glib.h>
-
 #define GNC_TYPE_GENERAL_SELECT          (gnc_general_select_get_type ())
 #define GNC_GENERAL_SELECT(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_general_select_get_type(), GNCGeneralSelect)
 #define GNC_GENERAL_SELECT_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, gnc_general_select_get_type(), \ GNCGeneralSelectClass)

Modified: gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,7 +25,6 @@
 
 #include <gnome.h>
 #include <libguile.h>
-
 #include <gconf/gconf.h>
 
 #ifdef USE_GUPPI
@@ -42,7 +41,6 @@
 #include "gnc-engine.h"
 #include "gnc-ui.h"
 
-#include <libgnomeui/gnome-window-icon.h>
 #include <gnc-dir.h>
 
 static QofLogModule log_module = GNC_MOD_GUI;

Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,7 +29,6 @@
 #include "gnc-engine-util.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui.h"
-#include "messages.h"
 
 
 /* This static indicates the debugging module that this .o belongs to.  */

Modified: gnucash/trunk/src/gnome-utils/gnc-html-guppi.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-html-guppi.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-html-guppi.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,6 @@
 #ifndef GNC_HTML_GUPPI_H
 #define GNC_HTML_GUPPI_H
 
-#include <gnome.h>
 #include "gnc-html.h"
 
 void        gnc_html_guppi_init(void);

Modified: gnucash/trunk/src/gnome-utils/gnc-html.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-html.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-html.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
@@ -31,20 +33,17 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <regex.h>
+#include <libguile.h>
 
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 #ifdef USE_GUPPI
 #include <libguppitank/guppi-tank.h>
 #endif
-#include <gnome.h>
-#include <regex.h>
-#include <glib.h>
-#include <libguile.h>
 
 #include "Account.h"
 #include "Group.h"
-#include "dialog-utils.h"
 #include "print-session.h"
 #include "gnc-engine.h"
 #include "gnc-gpg.h"
@@ -55,7 +54,6 @@
 #include "gnc-html-graph-gog.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 
 struct gnc_html_struct {

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -35,7 +35,8 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
+#include <gnome.h>
+#include <glib/gi18n.h>
 #ifndef HAVE_GLIB26
 #include "gkeyfile.h"
 #endif
@@ -61,7 +62,6 @@
 #include "gnc-ui.h"
 #include "gnc-version.h"
 #include "gnc-window.h"
-#include "messages.h"
 #include "gnc-gconf-utils.h"
 // +JSLED
 #include "gnc-html.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,8 +22,9 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <ctype.h>
-#include <gnome.h>
 
 #include "guile-util.h"
 #include "gnc-engine.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-period-select.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-period-select.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-period-select.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,12 +29,14 @@
     @author David Hampton <hampton at employees.org>
 */
 
-#include <config.h>
+#include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "gnc-date.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-period-select.h"
-#include "messages.h"
 
 enum {
   PROP_0,

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,16 +31,16 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
 #include <string.h>
-#include <glib/gprintf.h>
-#include <libgnome/libgnome.h>
 
 #include "gnc-file.h"
 #include "gnc-main-window.h"
 #include "gnc-plugin-file-history.h"
 #include "gnc-window.h"
 #include "gnc-engine.h"
-#include "messages.h"
 #include "gnc-gconf-utils.h"
 
 static GObjectClass *parent_class = NULL;

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-manager.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-manager.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-manager.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,9 +24,9 @@
 
 #include "config.h"
 
+#include <glib.h>
+
 #include "gnc-plugin-manager.h"
-
-#include "messages.h"
 #include "gnc-engine.h"
 #include "gnc-hooks.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -35,9 +35,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
 #include <string.h>
-#include <glib/gprintf.h>
-#include <libgnome/libgnome.h>
 #include <g-wrap-wct.h>
 
 #include "guile-util.h"
@@ -46,7 +45,6 @@
 #include "gnc-plugin-menu-additions.h"
 #include "gnc-window.h"
 #include "gnc-trace.h"
-#include "messages.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui.h"
 #include "gnc-menu-extensions.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -34,13 +34,15 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "gnc-plugin.h"
 #include "gnc-trace.h"
 #include "gnc-engine.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-gobject-utils.h"
-#include "messages.h"
 
 /** The debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_GUI;

Modified: gnucash/trunk/src/gnome-utils/gnc-query-list.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-query-list.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-query-list.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,13 +22,12 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include "dialog-utils.h"
 #include "gnc-ui-util.h"
 #include "gnc-engine-util.h"
 #include "gnc-component-manager.h"
-#include "messages.h"
 #include "gnc-query-list.h"
 #include "search-param.h"
 #include "QueryCore.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-recurrence.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-recurrence.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-recurrence.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,13 +23,14 @@
  */
 
 #include "config.h"
+
+#include <gnome.h>
 #include <glade/glade.h>
-#include <gnome.h>
-#include <glib.h>
 
 #include "dialog-utils.h"
 #include "gnc-recurrence.h"
 #include "Recurrence.h"
+#include "gnc-engine.h"
 #include "gnc-trace.h"
 #include "gnc-gdate-utils.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-gnome-utils.h"
 #include "gnc-splash.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,11 +24,12 @@
  */
 
 #include "config.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
-#include <gtk/gtkmain.h>
 
 #include "gnc-tree-model-account.h"
-
 #include "gnc-component-manager.h"
 #include "Account.h"
 #include "Group.h"
@@ -37,7 +38,6 @@
 #include "gnc-engine.h"
 #include "gnc-gobject-utils.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 #define TREE_MODEL_ACCOUNT_CM_CLASS "tree-model-account"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,11 +30,11 @@
  */
 
 #include "config.h"
+
+#include <gtk/gtk.h>
 #include <string.h>
-#include <gtk/gtkmain.h>
 
 #include "gnc-tree-model-commodity.h"
-
 #include "gnc-component-manager.h"
 #include "gnc-engine.h"
 #include "gnc-gobject-utils.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,8 +30,10 @@
  */
 
 #include "config.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
-#include <gtk/gtkmain.h>
 
 #include "gnc-component-manager.h"
 #include "gnc-engine.h"
@@ -40,7 +42,6 @@
 #include "gnc-tree-model-price.h"
 #include "gnc-trace.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 #define ITER_IS_NAMESPACE GINT_TO_POINTER(1)
 #define ITER_IS_COMMODITY GINT_TO_POINTER(2)

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,14 +24,13 @@
  */
 
 #include "config.h"
-#include <string.h>
+
 #include <gtk/gtk.h>
+#include <string.h>
 
 #include "gnc-tree-model.h"
-
 #include "gnc-gobject-utils.h"
 #include "gnc-engine.h"
-#include "messages.h"
 
 /** Static Globals *******************************************************/
 static QofLogModule log_module = GNC_MOD_GUI;

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "gnc-tree-view.h"
@@ -38,7 +39,6 @@
 #include "gnc-engine.h"
 #include "gnc-icons.h"
 #include "gnc-ui-util.h"
-#include "messages.h"
 
 
 #define SAMPLE_ACCOUNT_VALUE "$1,000,000.00"

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "gnc-tree-view.h"
@@ -38,8 +39,6 @@
 #include "gnc-gnome-utils.h"
 #include "gnc-icons.h"
 #include "gnc-ui-util.h"
-//#include "messages.h"
-#include <libgnome/libgnome.h>
 
 
 /** Static Globals *******************************************************/

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -34,7 +34,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <libgnome/libgnome.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "gnc-tree-view.h"

Modified: gnucash/trunk/src/gnome-utils/misc-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/misc-gnome-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/misc-gnome-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -19,7 +19,9 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <string.h>
+
 #include "misc-gnome-utils.h"
 
 /* ============================================================== */

Modified: gnucash/trunk/src/gnome-utils/print-session.c
===================================================================
--- gnucash/trunk/src/gnome-utils/print-session.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/print-session.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 #include "gnc-ui.h"
-#include "messages.h"
 #include "print-session.h"
 
 

Modified: gnucash/trunk/src/gnome-utils/print-session.h
===================================================================
--- gnucash/trunk/src/gnome-utils/print-session.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/print-session.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -31,13 +31,8 @@
     @author Copyright (C) 2000 Bill Gribble <grib at billgribble.com>
 */
 
-#include "config.h"
-
-#include <gnome.h>
 #include <libgnomeprint/gnome-print.h>
-
 #include <libgnomeprint/gnome-print-job.h>
-
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 

Modified: gnucash/trunk/src/gnome-utils/search-param.c
===================================================================
--- gnucash/trunk/src/gnome-utils/search-param.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/gnome-utils/search-param.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdarg.h>
-#include <gnome.h>
 
 #include "gnc-engine.h"
 #include "GNCId.h"

Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.c
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,10 +25,7 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
+#include <gnome.h>
 
 #include "Scrub.h"
 #include "dialog-commodity.h"

Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.h
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,12 +24,6 @@
 #ifndef DRUID_COMMODITY_H
 #define DRUID_COMMODITY_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
 #include "gnc-commodity.h"
 #include "gnc-engine.h"
 #include "qofsession.h"

Modified: gnucash/trunk/src/import-export/gnc-import-format-gnome.c
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-format-gnome.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/gnc-import-format-gnome.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -1,13 +1,15 @@
 
 
 #include "config.h"
+
+#include <gnome.h>
+
 #include "gnc-druid-gnome-ui.h"
 #include "gnc-import-format-gnome.h"
 #include "gnc-import-desc-format.h"
 
 #include "gnc-basic-gobject.h"
 #include "dialog-utils.h"
-#include "messages.h"
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 

Modified: gnucash/trunk/src/import-export/hbci/dialog-daterange.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-daterange.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/dialog-daterange.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include "dialog-utils.h"
 #include "gnc-ui.h"
@@ -102,9 +102,6 @@
 
   gtk_widget_grab_focus (glade_xml_get_widget (xml, "ok_button"));
 
-  /* Hide on close instead of destroy since we still need the values
-     from the boxes. */
-  /* gnome_dialog_close_hides (GTK_DIALOG (dialog), TRUE); */
   gtk_widget_show_all (GTK_WIDGET (dialog));
   
   result = gtk_dialog_run (GTK_DIALOG (dialog));

Modified: gnucash/trunk/src/import-export/hbci/dialog-daterange.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-daterange.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/dialog-daterange.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,6 @@
 #ifndef DIALOG_DATERANGE_H
 #define DIALOG_DATERANGE_H
 
-#include <gnome.h>
 #include "gnc-date.h"
 
 gboolean

Modified: gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,8 +25,6 @@
 #ifndef DIALOG_HBCITRANS_H
 #define DIALOG_HBCITRANS_H
 
-#include <gnome.h>
-
 #include <aqbanking/banking.h>
 #include <aqbanking/transaction.h>
 #include <aqbanking/job.h>

Modified: gnucash/trunk/src/import-export/hbci/dialog-pass.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-pass.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/dialog-pass.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-ui.h"

Modified: gnucash/trunk/src/import-export/hbci/dialog-pass.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-pass.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/dialog-pass.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,8 +23,6 @@
 #ifndef DIALOG_PASS_H
 #define DIALOG_PASS_H
 
-#include <gnome.h>
-
 gboolean
 gnc_hbci_get_password (GtkWidget *parent,
 		       const char *windowtitle,

Modified: gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/druid-hbci-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -30,24 +31,10 @@
 #include "druid-hbci-utils.h"
 #include "gnc-hbci-kvp.h"
 #include "gnc-hbci-utils.h"
-
-#include "dialog-utils.h"
 #include "druid-utils.h"
 #include "gnc-ui-util.h"
 #include "gnc-ui.h"
-/* #include "Group.h" */
-/* #include "glade/glade-xml.h" */
-/* #include "gnc-amount-edit.h" */
-/* #include "gnc-commodity-edit.h" */
-/* #include "gnc-general-select.h" */
-/* #include "gnc-component-manager.h" */
-/* #include "../gnome-utils/gnc-dir.h" */
-/* #include "gnc-gui-query.h" */
-/* #include "io-example-account.h" */
-/* #include "top-level.h" */
 
-#include "gnc-hbci-utils.h"
-
 /**
  * Save the reference strings to the HBCI accounts in the kvp's of the
  * gnucash accounts.*/

Modified: gnucash/trunk/src/import-export/hbci/druid-hbci-utils.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/druid-hbci-utils.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/druid-hbci-utils.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,6 @@
 #ifndef DRUID_HBCI_UTILS_H
 #define DRUID_HBCI_UTILS_H
 
-#include <gnome.h>
 #include <aqbanking/banking.h>
 #include "hbci-interaction.h"
 #include "gnc-hbci-utils.h"

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -21,18 +21,18 @@
 \********************************************************************/
 
 #include "config.h"
-#include "gnc-hbci-getbalance.h"
 
+#include <gnome.h>
+#include <glib/gi18n.h>
 #include <aqbanking/banking.h>
 
+#include "RecnWindow.h"
+#include "gnc-date.h"
+#include "gnc-hbci-getbalance.h"
+#include "gnc-hbci-utils.h"
+#include "gnc-numeric.h"
 #include "gnc-ui.h"
-#include "gnc-numeric.h"
-#include "gnc-date.h"
-#include "RecnWindow.h"
-
 #include "hbci-interaction.h"
-#include "gnc-hbci-utils.h"
-/* #include "dialog-hbcitrans.h" */
 
 
 void gnc_hbci_getbalance_debugprint(AB_JOB *balance_job,

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,9 +23,8 @@
 #ifndef GNC_HBCI_GETBALANCE_H
 #define GNC_HBCI_GETBALANCE_H
 
-#include <gnome.h>
-#include "Account.h"
 #include <aqbanking/jobgetbalance.h>
+#include "Account.h"
 
 /** Starts a GetBalance job, adds the job to the AB_BANKING, and
  * (currently) calls executeOutbox. */

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -21,6 +21,9 @@
 \********************************************************************/
 
 #include "config.h"
+
+#include <gnome.h>
+
 #include "gnc-hbci-gettrans.h"
 
 #include "gnc-ui.h"

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,6 @@
 #ifndef GNC_HBCI_GETTRANS_H
 #define GNC_HBCI_GETTRANS_H
 
-#include <gnome.h>
 #include <aqbanking/jobgettransactions.h>
 #include "Account.h"
 

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 #include "config.h"
 
 #include "gnc-hbci-trans-templ.h"
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 struct _trans_data 
 {

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,10 +23,12 @@
 \********************************************************************/
 
 #include "config.h"
-#include "gnc-hbci-transfer.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <aqbanking/banking.h>
 
+#include "gnc-hbci-transfer.h"
 #include "gnc-ui.h"
 #include "gnc-numeric.h"
 #include "dialog-transfer.h"

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,6 @@
 #ifndef GNC_HBCI_TRANSFER_H
 #define GNC_HBCI_TRANSFER_H
 
-#include <gnome.h>
 #include <aqbanking/jobsingletransfer.h>
 #include "Account.h"
 #include "dialog-hbcitrans.h"

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 #include "config.h"
 #include "gnc-hbci-utils.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <errno.h>
 #include <iconv.h>
 #include <langinfo.h>

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,10 +23,7 @@
 #ifndef GNC_HBCI_UTILS_H
 #define GNC_HBCI_UTILS_H
 
-#include <glib.h>
-#include <gnome.h>
 #include <iconv.h>
-
 #include <aqbanking/banking.h>
 #include <aqbanking/transaction.h>
 #include <aqbanking/account.h>

Modified: gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -35,7 +35,6 @@
 #include "gnc-plugin-page-register.h"
 #include "gnc-trace.h"
 #include "gnc-engine.h"
-#include "messages.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = "gnucash-hbci";

Modified: gnucash/trunk/src/import-export/hbci/hbci-interaction.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/hbci-interaction.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/hbci-interaction.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,13 +22,18 @@
 
 #include "config.h"
 
+#include <gnome.h>
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>
+#include <iconv.h>
+#include <aqbanking/banking.h>
+#include <gwenhywfar/bio_buffer.h>
+#include <gwenhywfar/xml.h>
+
 #include "hbci-interaction.h"
 #include "hbci-interactionP.h"
 
-#include <aqbanking/banking.h>
 #include "dialog-utils.h"
 #include "druid-utils.h"
 #include "gnc-ui-util.h"
@@ -38,11 +43,6 @@
 #include "dialog-pass.h"
 #include "gnc-hbci-utils.h"
 
-#include <gwenhywfar/bio_buffer.h>
-#include <gwenhywfar/xml.h>
-
-#include <iconv.h>
-
 gchar *gnc__extractText(const char *text);
 
 /** Adds the interactor and progressmonitor classes to the api. */

Modified: gnucash/trunk/src/import-export/hbci/hbci-interaction.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/hbci-interaction.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/hbci-interaction.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,7 +24,6 @@
 #define HBCI_INTERACTION_H
 
 #include <aqbanking/banking.h>
-#include <gnome.h>
 
 #define GCONF_SECTION "dialogs/import/hbci"
 #define KEY_CLOSE_ON_FINISH "close_on_finish"

Modified: gnucash/trunk/src/import-export/hbci/hbci-interactionP.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/hbci-interactionP.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/hbci/hbci-interactionP.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -25,7 +25,6 @@
 #define HBCI_INTERACTIONP_H
 
 #include <aqbanking/banking.h>
-#include <gnome.h>
 #include <iconv.h>
 
 

Modified: gnucash/trunk/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-account-matcher.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/import-account-matcher.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,6 +27,9 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "import-account-matcher.h"
 #include "import-utilities.h"
 #include "dialog-account.h"

Modified: gnucash/trunk/src/import-export/import-backend.c
===================================================================
--- gnucash/trunk/src/import-export/import-backend.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/import-backend.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,20 +29,16 @@
 
 #include "config.h"
 
-
 #include <glib.h>
-
 #include <stdlib.h> 
 #include <math.h>
+
 #include "gnc-gconf-utils.h"
 #include "import-backend.h"
 #include "import-utilities.h"
 #include "Account.h"
-#include "dialog-utils.h"
 #include "Query.h"
-
 #include "gnc-engine.h"
-
 #include "gnc-ui-util.h"
 
 #define GCONF_SECTION "dialogs/import/generic_matcher"

Modified: gnucash/trunk/src/import-export/import-commodity-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-commodity-matcher.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/import-commodity-matcher.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,22 +27,17 @@
 
 #include "config.h"
 
-
-#include <glib.h>
-#include <gmodule.h>
-
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
-
 #include <stdlib.h>
 #include <math.h>
+
 #include "import-commodity-matcher.h"
 #include "Account.h"
 #include "Transaction.h"
 #include "dialog-commodity.h"
-#include "dialog-utils.h"
-
 #include "gnc-engine.h"
-
 #include "gnc-ui-util.h"
 
 /********************************************************************\

Modified: gnucash/trunk/src/import-export/import-format-dialog.c
===================================================================
--- gnucash/trunk/src/import-export/import-format-dialog.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/import-format-dialog.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <glib.h>
-
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 
 #include "import-parse.h"

Modified: gnucash/trunk/src/import-export/import-main-matcher.h
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/import-main-matcher.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,7 +27,6 @@
 #ifndef GNC_IMPORT_MAIN_MATCHER_H
 #define GNC_IMPORT_MAIN_MATCHER_H
 
-#include <gnome.h>
 #include "Transaction.h"
 
 typedef struct _main_matcher_info GNCImportMainMatcher;

Modified: gnucash/trunk/src/import-export/import-settings.c
===================================================================
--- gnucash/trunk/src/import-export/import-settings.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/import-settings.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,7 +29,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include "dialog-utils.h"
+
 #include "import-settings.h"
 #include "gnc-gconf-utils.h"
 

Modified: gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c
===================================================================
--- gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,13 +27,12 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
-
-#include <glib.h>
 #include <libguile.h>
-#include <gmodule.h>
 
 #include "Account.h"
 #include "Transaction.h"
@@ -45,9 +44,7 @@
 #include "gnc-ui-util.h"
 #include "gnc-gconf-utils.h"
 
-#include "dialog-utils.h"
 
-
 #define GCONF_SECTION "dialogs/log_replay"
 
 /* NW: If you want a new log_module, just define

Modified: gnucash/trunk/src/import-export/log-replay/gnc-plugin-log-replay.c
===================================================================
--- gnucash/trunk/src/import-export/log-replay/gnc-plugin-log-replay.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/log-replay/gnc-plugin-log-replay.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,10 +23,12 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "gnc-log-replay.h"
 #include "gnc-plugin-log-replay.h"
 #include "gnc-plugin-manager.h"
-#include "messages.h"
 
 static void gnc_plugin_log_replay_class_init (GncPluginLogreplayClass *klass);
 static void gnc_plugin_log_replay_init (GncPluginLogreplay *plugin);

Modified: gnucash/trunk/src/import-export/mt940/gnc-mt940-import.c
===================================================================
--- gnucash/trunk/src/import-export/mt940/gnc-mt940-import.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/mt940/gnc-mt940-import.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,13 +27,11 @@
 
 #include "config.h"
 
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 
-#include <glib.h>
-#include <gmodule.h>
-
 #include <openhbci/swiftparser.h>
 
 #include "gnc-hbci-gettrans.h"

Modified: gnucash/trunk/src/import-export/mt940/gnc-plugin-mt940.c
===================================================================
--- gnucash/trunk/src/import-export/mt940/gnc-plugin-mt940.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/mt940/gnc-plugin-mt940.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,11 +22,12 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "gnc-plugin-mt940.h"
 #include "gnc-plugin-manager.h"
-
 #include "gnc-mt940-import.h"
-#include "messages.h"
 
 static void gnc_plugin_mt940_class_init (GncPluginMt940Class *klass);
 static void gnc_plugin_mt940_init (GncPluginMt940 *plugin);

Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,13 +27,12 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
-
-#include <glib.h>
 #include <libguile.h>
-#include <gmodule.h>
 
 #include <libofx/libofx.h>
 #include "import-account-matcher.h"
@@ -51,8 +50,6 @@
 #include "gnc-ui-util.h"
 #include "gnc-gconf-utils.h"
 
-#include "dialog-utils.h"
-
 #define GCONF_SECTION "dialogs/import/ofx"
 
 static QofLogModule log_module = GNC_MOD_IMPORT;

Modified: gnucash/trunk/src/import-export/ofx/gnc-plugin-ofx.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-plugin-ofx.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/ofx/gnc-plugin-ofx.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,12 +22,13 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "gnc-ofx-import.h"
 #include "gnc-plugin-ofx.h"
 #include "gnc-plugin-manager.h"
 
-#include "gnc-ofx-import.h"
-#include "messages.h"
-
 static void gnc_plugin_ofx_class_init (GncPluginOfxClass *klass);
 static void gnc_plugin_ofx_init (GncPluginOfx *plugin);
 static void gnc_plugin_ofx_finalize (GObject *object);

Modified: gnucash/trunk/src/import-export/qif/qif-defaults.c
===================================================================
--- gnucash/trunk/src/import-export/qif/qif-defaults.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/qif/qif-defaults.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,10 +27,9 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "gnc-helpers.h"
-#include "messages.h"
-
 #include "qif-import-p.h"
 #include "qif-objects-p.h"
 #include "qif-defaults.h"

Modified: gnucash/trunk/src/import-export/qif/qif-parse.c
===================================================================
--- gnucash/trunk/src/import-export/qif/qif-parse.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/qif/qif-parse.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,6 +27,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 /* For regex */
@@ -35,7 +36,6 @@
 
 #include <stdarg.h>
 
-#include "messages.h"
 #include "gnc-engine.h"
 #include "gnc-ui-util.h"
 

Modified: gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <libguile.h>
 

Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <libgnomeui/gnome-window-icon.h>
 
 #include "Account.h"
 #include "Transaction.h"
@@ -46,7 +45,6 @@
 #include "gnc-ui-util.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui.h"
-#include "messages.h"
 #include "guile-mappings.h"
 
 #include <g-wrap-wct.h>

Modified: gnucash/trunk/src/import-export/qif-import/gnc-plugin-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/gnc-plugin-qif-import.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/import-export/qif-import/gnc-plugin-qif-import.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,14 +23,14 @@
 
 #include "config.h"
 
-#include "gnc-plugin-qif-import.h"
-#include "gnc-plugin-manager.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-preferences.h"
 #include "druid-qif-import.h"
-#include "messages.h"
-
 #include "gnc-druid-test.h"
+#include "gnc-plugin-manager.h"
+#include "gnc-plugin-qif-import.h"
 
 static void gnc_plugin_qif_import_class_init (GncPluginQifImportClass *klass);
 static void gnc_plugin_qif_import_init (GncPluginQifImport *plugin);

Modified: gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,14 +23,15 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <time.h>
+#include <stdlib.h>
 
 #include "dialog-utils.h"
 #include "gnc-date-edit.h"
 #include "gnc-engine-util.h"
 #include "gnc-ui.h"
-#include "messages.h"
 
 
 /* This static indicates the debugging module that this .o belongs to.  */

Modified: gnucash/trunk/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-control.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/ledger-core/split-register-control.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,12 +22,14 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n.h>
+
 #include "Group.h"
 #include "Scrub.h"
 #include "combocell.h"
 #include "gnc-component-manager.h"
 #include "gnc-ui.h"
-#include "messages.h"
 #include "pricecell.h"
 #include "datecell.h"
 #include "split-register-control.h"

Modified: gnucash/trunk/src/register/ledger-core/split-register-layout.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-layout.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/ledger-core/split-register-layout.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -24,9 +24,9 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "gnc-engine.h"
-#include "messages.h"
 #include "split-register-layout.h"
 
 

Modified: gnucash/trunk/src/register/ledger-core/split-register-model.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-model.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/ledger-core/split-register-model.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "Group.h"
 #include "datecell.h"
@@ -30,7 +31,6 @@
 #include "gnc-gconf-utils.h"
 #include "gnc-err-popup.h"
 #include "gnc-ui.h"
-#include "messages.h"
 #include "pricecell.h"
 #include "recncell.h"
 #include "split-register.h"

Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/ledger-core/split-register.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <libguile.h>
 
 #include "combocell.h"
@@ -37,7 +38,6 @@
 #include "gnc-ledger-display.h"
 #include "gnc-ui.h"
 #include "guile-util.h"
-#include "messages.h"
 #include "numcell.h"
 #include "pricecell.h"
 #include "quickfillcell.h"

Modified: gnucash/trunk/src/register/register-core/basiccell.c
===================================================================
--- gnucash/trunk/src/register/register-core/basiccell.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/register-core/basiccell.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -39,7 +39,6 @@
 #include <string.h>
 
 #include "basiccell.h"
-#include "dialog-utils.h"
 #include "gnc-engine.h"
 
 /* Debugging module */

Modified: gnucash/trunk/src/register/register-core/quickfillcell.c
===================================================================
--- gnucash/trunk/src/register/register-core/quickfillcell.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/register-core/quickfillcell.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -41,7 +41,6 @@
 #include <string.h>
 
 #include "basiccell.h"
-#include "dialog-utils.h"
 #include "gnc-ui-util.h"
 #include "quickfillcell.h"
 

Modified: gnucash/trunk/src/register/register-core/table-allgui.c
===================================================================
--- gnucash/trunk/src/register/register-core/table-allgui.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/register-core/table-allgui.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -42,7 +42,6 @@
 
 #include "table-allgui.h"
 #include "cellblock.h"
-#include "dialog-utils.h"
 #include "gnc-engine.h"
 
 

Modified: gnucash/trunk/src/register/register-gnome/combocell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/combocell-gnome.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/register-gnome/combocell-gnome.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -42,7 +42,6 @@
 #include "gnucash-item-edit.h"
 #include "gnucash-item-list.h"
 #include "gnucash-sheet.h"
-#include "messages.h"
 #include "table-allgui.h"
 
 #define KEY_AUTO_RAISE_LISTS	"auto_raise_lists"

Modified: gnucash/trunk/src/register/register-gnome/gnucash-style.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-style.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/register/register-gnome/gnucash-style.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -30,7 +30,6 @@
 #include "gnucash-grid.h"
 #include "gnucash-item-edit.h"
 #include "gnucash-style.h"
-#include "messages.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-engine.h"
 

Modified: gnucash/trunk/src/report/report-gnome/dialog-column-view.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-column-view.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/report/report-gnome/dialog-column-view.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -29,7 +29,6 @@
 #include "dialog-column-view.h"
 #include "dialog-options.h"
 #include "dialog-utils.h"
-#include "messages.h"
 #include "option-util.h"
 #include "window-report.h"
 #include "guile-mappings.h"

Modified: gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-style-sheet.h"
 #include "dialog-options.h"
 #include "dialog-utils.h"
 #include "gnc-ui.h"
-#include "messages.h"
 
 StyleSheetDialog * gnc_style_sheet_dialog = NULL;
 

Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -39,14 +39,15 @@
 
 #include "config.h"
 
-#include <errno.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #ifndef HAVE_GLIB26
 #include "gkeyfile.h"
 #endif
 #include <g-wrap-wct.h>
 #include <libguile.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 #include "gnc-component-manager.h"
 #include "gnc-engine.h"
@@ -62,7 +63,6 @@
 #include "gnc-ui.h"
 #include "gnc-window.h"
 #include "guile-util.h"
-#include "messages.h"
 #include "option-util.h"
 
 #define WINDOW_REPORT_CM_CLASS "window-report"

Modified: gnucash/trunk/src/report/report-gnome/window-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/window-report.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/report/report-gnome/window-report.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -27,8 +27,8 @@
 
 #include "config.h"
 
+#include <gnome.h>
 #include <errno.h>
-#include <gnome.h>
 #include <libguile.h>
 #include <sys/stat.h>
 

Modified: gnucash/trunk/src/report/report-gnome/window-report.h
===================================================================
--- gnucash/trunk/src/report/report-gnome/window-report.h	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/report/report-gnome/window-report.h	2005-11-19 23:53:34 UTC (rev 11981)
@@ -23,7 +23,6 @@
 #ifndef GNC_REPORT_WINDOW_H
 #define GNC_REPORT_WINDOW_H
 
-#include <gnome.h>
 #include <libguile.h>
 
 #include "gnc-html.h"

Modified: gnucash/trunk/src/report/stylesheets/gnc-plugin-stylesheets.c
===================================================================
--- gnucash/trunk/src/report/stylesheets/gnc-plugin-stylesheets.c	2005-11-19 23:07:12 UTC (rev 11980)
+++ gnucash/trunk/src/report/stylesheets/gnc-plugin-stylesheets.c	2005-11-19 23:53:34 UTC (rev 11981)
@@ -22,13 +22,14 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 #include "dialog-style-sheet.h"
-#include <gtk/gtk.h>
 #include "gnc-gnome-utils.h"
 #include "gnc-plugin-stylesheets.h"
 #include "gnc-plugin-manager.h"
 #include "gnc-engine.h"
-#include "messages.h"
 
 static void gnc_plugin_stylesheets_class_init (GncPluginStylesheetsClass *klass);
 static void gnc_plugin_stylesheets_init (GncPluginStylesheets *plugin);



More information about the gnucash-changes mailing list