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.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11981 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,5 +1,11 @@
 2005-11-19  David Hampton  <hampton@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@employees.org>

src/app-utils/file-utils.c

@@ -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"
  

src/app-utils/gnc-exp-parser.c

@@ -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"
 

src/app-utils/gnc-gettext-util.c

@@ -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"
 
 /* ============================================================== */

src/app-utils/gnc-ui-util.c

@@ -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"
 

src/app-utils/guile-util.c

@@ -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.  */

src/app-utils/option-util.c

@@ -22,8 +22,9 @@
 
 #include "config.h"
 
-#include <time.h>
 #include <glib.h>
+#include <glib/gi18n.h>
+#include <time.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>
 

src/backend/file/gnc-backend-file.c

@@ -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"
 

src/backend/file/io-gncbin-r.c

@@ -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"

src/backend/postgres/PostgresBackend.c

@@ -25,8 +25,9 @@
 
 #include "config.h"
 
-#include <ctype.h>
 #include <glib.h>
+#include <glib/gi18n.h>
+#include <ctype.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"

src/backend/postgres/putil.c

@@ -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"
 

src/backend/postgres/upgrade.c

@@ -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"
 

src/business/business-core/gncBillTerm.c

@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "messages.h"
 #include "gnc-engine.h"
 #include "gncBillTermP.h"
 

src/business/business-core/gncCustomer.c

@@ -31,7 +31,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include "messages.h"
 #include "gnc-commodity.h"
 
 #include "gncAddressP.h"

src/business/business-core/gncEmployee.c

@@ -32,7 +32,6 @@
 #include <string.h>
 
 #include "Account.h"
-#include "messages.h"
 #include "gnc-commodity.h"
 #include "gncAddressP.h"
 #include "gncEmployee.h"

src/business/business-core/gncEntry.c

@@ -29,7 +29,6 @@
 
 #include <glib.h>
 
-#include "messages.h"
 #include "gnc-commodity.h"
 
 #include "gncEntry.h"

src/business/business-core/gncInvoice.c

@@ -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"

src/business/business-core/gncJob.c

@@ -31,7 +31,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include "messages.h"
 #include "gncInvoice.h"
 #include "gncJob.h"
 #include "gncJobP.h"

src/business/business-core/gncOrder.c

@@ -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"

src/business/business-core/gncTaxTable.c

@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "messages.h"
 #include "gncTaxTableP.h"
 
 struct _gncTaxTable 

src/business/business-core/gncVendor.c

@@ -31,7 +31,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include "messages.h"
 #include "gnc-commodity.h"
 #include "gncAddressP.h"
 #include "gncBillTermP.h"

src/business/business-core/test/test-business.c

@@ -28,7 +28,6 @@
 
 #include "qof.h"
 #include "gnc-module.h"
-#include "messages.h"
 
 #include "gncBusiness.h"
 #include "test-stuff.h"

src/business/business-gnome/business-gnome-utils.c

@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "Group.h"
 #include "Account.h"

src/business/business-gnome/business-options-gnome.c

@@ -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>
 

src/business/business-gnome/business-urls.c

@@ -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"

src/business/business-gnome/businessmod-gnome.c

@@ -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"

src/business/business-gnome/dialog-billterms.c

@@ -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"

src/business/business-gnome/dialog-customer.c

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-amount-edit.h"

src/business/business-gnome/dialog-employee.c

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-amount-edit.h"

src/business/business-gnome/dialog-job.c

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

src/business/business-gnome/dialog-order.c

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

src/business/business-gnome/dialog-payment.c

@@ -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"

src/business/business-gnome/dialog-vendor.c

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "dialog-utils.h"
 #include "gnc-currency-edit.h"

src/business/business-gnome/gnc-plugin-business.c

@@ -25,8 +25,9 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <string.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"

src/business/business-gnome/search-owner.c

@@ -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"

src/business/business-ledger/gncEntryLedger.c

@@ -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"

src/business/business-ledger/gncEntryLedgerControl.c

@@ -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"

src/business/business-ledger/gncEntryLedgerLayout.c

@@ -26,8 +26,7 @@
 #include "config.h"
 
 #include <glib.h>
-
-#include "messages.h"
+#include <glib/gi18n.h>
 
 #include "gncEntryLedgerP.h"
 #include "gncEntryLedgerLayout.h"

src/business/business-ledger/gncEntryLedgerLoad.c

@@ -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"

src/business/business-ledger/gncEntryLedgerModel.c

@@ -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 */

src/business/dialog-tax-table/dialog-tax-table.c

@@ -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"

src/engine/Account.c

@@ -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;

src/engine/FreqSpec.c

@@ -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;
 /* 

src/engine/Makefile.am

@@ -39,7 +39,6 @@ libgncmod_engine_la_SOURCES = \
   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 @@ gncinclude_HEADERS = \
   gnc-session-scm.h \
   gncObject.h \
   kvp-scm.h \
-  messages.h \
   policy.h
 
 noinst_HEADERS = \

src/engine/SchedXaction.c

@@ -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;
 

src/engine/Scrub.c

@@ -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;

src/engine/Scrub2.c

@@ -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;

src/engine/Transaction.c

@@ -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 

src/engine/cap-gains.c

@@ -56,6 +56,7 @@ ToDo:
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "AccountP.h"
@@ -69,7 +70,6 @@ ToDo:
 #include "gnc-engine.h"
 #include "gnc-lot.h"
 #include "gnc-lot-p.h"
-#include "messages.h"
 #include "policy.h"
 #include "policy-p.h"
 

src/engine/gnc-commodity.c

@@ -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; 
 

src/engine/messages.c

@@ -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@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;
-		}
-	}
-}

src/engine/messages.h

@@ -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 */

src/engine/test/test-object.c

@@ -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"

src/engine/test/test-querynew.c

@@ -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"
 

src/gnome-search/dialog-search.c

@@ -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"

src/gnome-search/gncmod-gnome-search.c

@@ -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"

src/gnome-search/search-account.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "Account.h"
 #include "QueryCore.h"

src/gnome-search/search-boolean.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "QueryCore.h"
 

src/gnome-search/search-core-type.h

@@ -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"

src/gnome-search/search-date.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-date.h"
 #include "gnc-date-edit.h"

src/gnome-search/search-double.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-amount-edit.h"
 #include "QueryCore.h"

src/gnome-search/search-int64.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-amount-edit.h"
 #include "QueryCore.h"

src/gnome-search/search-numeric.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gnc-amount-edit.h"
 #include "QueryCore.h"

src/gnome-search/search-reconciled.c

@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "QueryCore.h"
 #include "Transaction.h"	/* for ?REC */

src/gnome-search/search-string.c

@@ -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"

src/gnome-utils/QuickFill.c

@@ -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"

src/gnome-utils/cursors.c

@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include "gnc-ui.h"
 

src/gnome-utils/dialog-account.c

@@ -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"

src/gnome-utils/dialog-commodity.c

@@ -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;
 

src/gnome-utils/dialog-commodity.h

@@ -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

src/gnome-utils/dialog-options.c

@@ -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"

src/gnome-utils/dialog-options.h

@@ -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"

src/gnome-utils/dialog-transfer.c

@@ -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"
 

src/gnome-utils/dialog-utils.c

@@ -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"

src/gnome-utils/dialog-utils.h

@@ -27,9 +27,7 @@
 #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,
@@ -88,7 +86,9 @@ void gnc_save_window_size (const char *section, GtkWindow *window);
  *       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,

src/gnome-utils/druid-gconf-setup.c

@@ -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

src/gnome-utils/druid-utils.c

@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include <gnome.h>
+
 #include "dialog-utils.h"
 #include "druid-utils.h"
 #include "gnc-engine-util.h"

src/gnome-utils/gnc-account-sel.c

@@ -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"

src/gnome-utils/gnc-account-sel.h

@@ -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())	

src/gnome-utils/gnc-amount-edit.c

@@ -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"
 

src/gnome-utils/gnc-amount-edit.h

@@ -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"
 

src/gnome-utils/gnc-commodity-edit.c

@@ -33,7 +33,9 @@
  * 	    Derek Atkins <warlord@MIT.EDU>
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <gtk/gtk.h>
 
 #include "dialog-commodity.h"
 #include "gnc-commodity-edit.h"

src/gnome-utils/gnc-commodity-edit.h

@@ -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 */

src/gnome-utils/gnc-currency-edit.c

@@ -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);

src/gnome-utils/gnc-currency-edit.h

@@ -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 */

src/gnome-utils/gnc-date-delta.c

@@ -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

src/gnome-utils/gnc-date-delta.h

@@ -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,

src/gnome-utils/gnc-date-edit.c

@@ -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 {

src/gnome-utils/gnc-date-format.c

@@ -34,6 +34,7 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdio.h>
 

src/gnome-utils/gnc-date-format.h

@@ -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 ())

src/gnome-utils/gnc-dense-cal.c

@@ -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... */

src/gnome-utils/gnc-dialog.c

@@ -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;
 

src/gnome-utils/gnc-druid-provider-file-gnome.c

@@ -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"
 

src/gnome-utils/gnc-druid-provider-multifile-gnome.c

@@ -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"
 

src/gnome-utils/gnc-embedded-window.c

@@ -38,7 +38,6 @@
 #include "gnc-plugin-manager.h"
 #include "gnc-ui.h"
 #include "gnc-window.h"
-#include "messages.h"
 
 /* Static Globals *******************************************************/
 

src/gnome-utils/gnc-file.c

@@ -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"

src/gnome-utils/gnc-frequency.c

@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <math.h>
 #include <time.h>
 

src/gnome-utils/gnc-frequency.h

@@ -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)

src/gnome-utils/gnc-general-select.c

@@ -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>

src/gnome-utils/gnc-general-select.h

@@ -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)