gnome-i18n.h

[Rodrigo Moya <rodrigo gnome-db org>]

Hi!

I'm having right now problems compiling libgnome due to _() and N_()
being defined in bonobo-i18n.h and gnome-i18n.h.

So, would it be ok to remove the #defines from gnome-i18n.h and rely on
the bonobo-i18n.h definitions? If so, here's a patch that does so.

cheers
-- 
Rodrigo Moya <rodrigo gnome-db org> - <rodrigo ximian com>
http://www.gnome-db.org/ - http://www.ximian.com/

? idl/Makefile
? idl/Makefile.in
? monikers/Makefile
? monikers/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnome/ChangeLog,v
retrieving revision 1.70
diff -u -r1.70 ChangeLog
--- ChangeLog	2001/09/02 18:39:49	1.70
+++ ChangeLog	2001/09/03 23:05:54
@@ -1,3 +1,8 @@
+2001-09-03  Rodrigo Moya <rodrigo gnome-db org>
+
+	* libgnome/gnome-i18n.h: removed #define's for gettext macros, and
+	include bonobo/bonobo-i18n.h, which includes them
+
 2001-09-02  Anders Carlsson  <andersca gnu org>
 
 	* Makefile.am: Don't build tests/
Index: libgnome/gnome-i18n.h
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-i18n.h,v
retrieving revision 1.20
diff -u -r1.20 gnome-i18n.h
--- libgnome/gnome-i18n.h	2001/09/02 18:39:50	1.20
+++ libgnome/gnome-i18n.h	2001/09/03 23:05:54
@@ -32,36 +32,12 @@
 #define __GNOME_I18N_H__ 1
 
 #include <glib.h>
-
-G_BEGIN_DECLS
-
-#if !defined(__GNOME_I18NP_H__)
-
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN
-#        undef _
-#        define _(String) dgettext (GNOME_EXPLICIT_TRANSLATION_DOMAIN, String)
-#    else 
-#        define _(String) gettext (String)
-#    endif
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
-#else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
+#ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN
+#  define BONOBO_EXPLICIT_TRANSLATION_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN
 #endif
+#include <bonobo/bonobo-i18n.h>
 
-#endif
+G_BEGIN_DECLS
 
 /* 'gnome_i18n_get_language_list' returns a list of language strings.
  *
Index: libgnome/gnome-i18nP.h
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-i18nP.h,v
retrieving revision 1.14
diff -u -r1.14 gnome-i18nP.h
--- libgnome/gnome-i18nP.h	2001/09/02 19:11:20	1.14
+++ libgnome/gnome-i18nP.h	2001/09/03 23:05:54
@@ -32,26 +32,10 @@
 #ifndef __GNOME_I18NP_H__
 #define __GNOME_I18NP_H__ 1
 
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    undef _
-#    define _(String) dgettext (PACKAGE, String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
-#else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
+#include <config.h>
+#ifndef GNOME_EXPLICIT_TRANSLATION_DOMAIN
+#  define GNOME_EXPLICIT_TRANSLATION_DOMAIN PACKAGE
 #endif
-
 #include "gnome-i18n.h"
 
 #endif /* __GNOME_I18NP_H__ */