kinda important: glib-gettextize stuff

From: jacob berkman <jacob ximian com>
To: gnome-2-0 <gnome-2-0-list gnome org>
Cc: gnome-hackers <gnome-hackers gnome org>
Subject: kinda important: glib-gettextize stuff
Date: 29 Oct 2001 12:14:34 -0500

i'm merging in the glib-gettextize patches i have.

gnome-common's autogen will run glib-gettextize if you use the
AM_GLIB_GNU_GETTEXT macro in gnome-common.  cvs intltool works fine with
this.  glib-gettextize is in cvs glib, and i will be making a small
tarball with it for the platform release if glib 1.3.10 doesn't have it.

if your module uses gnome-common and AM_GLIB_GNU_GETTEXT and isn't
listed at the end, you should apply the same things to your module.

these patches generally contain some subset of:

1. configure.in:

    -AM_INIT_AUTOMAKE(libbonobo2, 1.103.0)
    +AM_INIT_AUTOMAKE(libbonobo, 1.103.0)

    -AM_PROG_XML_I18N_TOOLS
    +AC_PROG_INTLTOOL

    +GETTEXT_PACKAGE=libbonobo-2.0
    +AC_SUBST(GETTEXT_PACKAGE)
    +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
    
    -AM_GNOME2_GETTEXT
    +AM_GLIB_GNU_GETTEXT

2. Makefile.am's:

    - XML_I18N_MERGE_SERVER_RULE@
    + INTLTOOL_SERVER_RULE@
    
    -       xml-i18n-extract.in  \
    -       xml-i18n-merge.in    \
    -       xml-i18n-update.in   \
    +       intltool-extract.in  \
    +       intltool-merge.in    \
    +       intltool-update.in   \
    
3. acconfig.h:
    
    +#undef GETTEXT_PACKAGE

4. various .[ch] files:

    -  bindtextdomain(PACKAGE, GNOMELOCALEDIR);  
    -  textdomain(PACKAGE);
    +  bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);  
    +  textdomain(GETTEXT_PACKAGE);

    -#define _(String) dgettext (PACKAGE, String)
    +#define _(String) dgettext (GETTEXT_PACKAGE, String)

and lo there was sanity in tarball names and .mo files from different
gnome platforms coexisted in peace!

i'm attaching all the patches; please revert / flame at will.  i can
probably do eel and librsvg later today... if there are any modules i
missed let me know.  if it doesn't build right away i'll find it since
i'm about to run a snapshot.

thanks,
jacob
-- 
"Beat mixing is 10000 times more fun than even video games."
	-- bt

Index: gconf/ChangeLog
===================================================================
RCS file: /cvs/gnome/gconf/ChangeLog,v
retrieving revision 1.309
diff -u -r1.309 ChangeLog
--- gconf/ChangeLog	2001/10/16 18:29:12	1.309
+++ gconf/ChangeLog	2001/10/29 17:10:27
@@ -1,3 +1,13 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* gconf-editor/gconf-editor.c (main): bind to GETTEXT_PACKAGE
+	rather than PACKAGE
+
+	* autogen.sh: call glib-gettextize
+
+	* configure.in: set the GETTEXT_PACKAGE to be more like the gnome
+	1 one
+
 2001-10-16  Ross Golder  <ross golder org>
 
 	* gconf.spec.in: updated installation paths
Index: gconf/autogen.sh
===================================================================
RCS file: /cvs/gnome/gconf/autogen.sh,v
retrieving revision 1.6
diff -u -r1.6 autogen.sh
--- gconf/autogen.sh	2001/08/02 05:31:06	1.6
+++ gconf/autogen.sh	2001/10/29 17:10:27
@@ -104,6 +104,14 @@
 	echo "Making $dr/aclocal.m4 writable ..."
 	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
+      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+	echo "Creating $dr/aclocal.m4 ..."
+	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+	echo "Running gettextize...  Ignore non-fatal messages."
+	echo "no" | glib-gettextize --force --copy
+	echo "Making $dr/aclocal.m4 writable ..."
+	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+      fi
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
 	echo "Running libtoolize..."
 	libtoolize --force --copy
Index: gconf/configure.in
===================================================================
RCS file: /cvs/gnome/gconf/configure.in,v
retrieving revision 1.100
diff -u -r1.100 configure.in
--- gconf/configure.in	2001/10/14 17:34:55	1.100
+++ gconf/configure.in	2001/10/29 17:10:27
@@ -42,7 +42,7 @@
 MAJOR_VERSION=2
 AC_SUBST(MAJOR_VERSION)
 
-GETTEXT_PACKAGE=gconf$MAJOR_VERSION
+GETTEXT_PACKAGE=GConf$MAJOR_VERSION
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
@@ -228,7 +228,7 @@
 
 ALL_LINGUAS="az ca cs da de el es fi fr ga gl hu it ja ko nl nn no pt_BR ro ru sk sl sv tr uk zh_CN"
 
-AM_GCONF_GNU_GETTEXT
+AM_GLIB_GNU_GETTEXT
 
 # AM_GNU_GETTEXT above substs $DATADIRNAME
 # this is the directory where the *.{mo,gmo} files are installed
Index: gconf/gconf-editor/gconf-editor.c
===================================================================
RCS file: /cvs/gnome/gconf/gconf-editor/gconf-editor.c,v
retrieving revision 1.10
diff -u -r1.10 gconf-editor.c
--- gconf/gconf-editor/gconf-editor.c	2000/08/31 21:25:07	1.10
+++ gconf/gconf-editor/gconf-editor.c	2001/10/29 17:10:27
@@ -61,8 +61,8 @@
   GnomeClient* client;
   GError* err = NULL;
   
-  bindtextdomain(PACKAGE, GNOMELOCALEDIR);  
-  textdomain(PACKAGE);
+  bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);  
+  textdomain(GETTEXT_PACKAGE);
 
   if (!gconf_init(argc, argv, &err))
     {

Index: gnome-common/macros2/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-common/macros2/ChangeLog,v
retrieving revision 1.31
diff -u -r1.31 ChangeLog
--- gnome-common/macros2/ChangeLog	2001/10/15 15:28:59	1.31
+++ gnome-common/macros2/ChangeLog	2001/10/29 17:10:29
@@ -1,3 +1,7 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* autogen.sh: add check for glib-gettextize
+
 2001-10-15  Bastien Nocera  <hadess hadess net>
 
 	* Makefile.am, curses.m4: added curses.m4 (copied from the gnome1
Index: gnome-common/macros2/autogen.sh
===================================================================
RCS file: /cvs/gnome/gnome-common/macros2/autogen.sh,v
retrieving revision 1.13
diff -u -r1.13 autogen.sh
--- gnome-common/macros2/autogen.sh	2001/10/02 19:20:02	1.13
+++ gnome-common/macros2/autogen.sh	2001/10/29 17:10:29
@@ -49,17 +49,29 @@
   }
 }
 
-grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-  (gettext --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
-    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz";
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
 
+if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" $srcdir/configure.in >/dev/null; then
+  if grep "sed.*POTFILES" $srcdir/configure.in >/dev/null; then
+    GETTEXTIZE=""
+  else
+    if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+      GETTEXTIZE="glib-gettextize"
+      GETTEXTIZE_URL="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.11.tar.gz";
+    else
+      GETTEXTIZE="gettextize"
+      GETTEXTIZE_URL="ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz";
+    fi
+
+    if ! $GETTEXTIZE --version < /dev/null > /dev/null 2>&1; then
+      echo
+      echo "**Error**: You must have \`$GETTEXTIZE' installed to compile $PKG_NAME."
+      echo "Get $GETTEXTIZE_URL"
+      echo "(or a newer version if it is available)"
+      DIE=1
+    fi
+  fi
+fi
+
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
@@ -106,17 +118,14 @@
     ( cd $dr
 
       aclocalinclude="$ACLOCAL_FLAGS"
-      if grep "^AM_[A-Z0-9_]\+_GETTEXT" configure.in >/dev/null; then
-	if grep "sed.*POTFILES" configure.in >/dev/null; then
-	  : do nothing -- we still have an old unmodified configure.in
-	else
-	  echo "Creating $dr/aclocal.m4 ..."
-	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "Running gettextize...  Ignore non-fatal messages."
-	  echo "no" | gettextize --force --copy
-	  echo "Making $dr/aclocal.m4 writable ..."
-	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        fi
+
+      if test "$GETTEXTIZE"; then
+	echo "Creating $dr/aclocal.m4 ..."
+	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+	echo "Running $GETTEXTIZE...  Ignore non-fatal messages."
+	echo "no" | $GETTEXTIZE --force --copy
+	echo "Making $dr/aclocal.m4 writable ..."
+	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
       if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
         echo "Running intltoolize..."

Index: gnome-vfs/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.1142
diff -u -r1.1142 ChangeLog
--- gnome-vfs/ChangeLog	2001/10/28 02:15:58	1.1142
+++ gnome-vfs/ChangeLog	2001/10/29 17:10:31
@@ -1,3 +1,11 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* libgnomevfs/gnome-vfs-i18n.h (_): use GETTEXT_PACAKGE
+
+	* configure.in: set GETTEXT_PACKAGE and use AM_GLIB_GNU_GETTEXT
+
+	* acconfig.h: add GETTEXT_PACAKGE
+
 2001-10-27  jacob berkman  <jacob ximian com>
 
 	* libgnomevfs/gnome-vfs-async-ops.h: 
Index: gnome-vfs/acconfig.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/acconfig.h,v
retrieving revision 1.13
diff -u -r1.13 acconfig.h
--- gnome-vfs/acconfig.h	2001/08/26 05:56:42	1.13
+++ gnome-vfs/acconfig.h	2001/10/29 17:10:31
@@ -15,3 +15,5 @@
 #undef ENABLE_PROFILER
 #undef HAVE_OPENSSL
 #undef HAVE_FAM
+#undef GETTEXT_PACKAGE
+
Index: gnome-vfs/configure.in
===================================================================
RCS file: /cvs/gnome/gnome-vfs/configure.in,v
retrieving revision 1.142
diff -u -r1.142 configure.in
--- gnome-vfs/configure.in	2001/10/17 15:56:35	1.142
+++ gnome-vfs/configure.in	2001/10/29 17:10:31
@@ -84,8 +84,12 @@
 AM_GNOME_SIZE_T
 AM_GNOME_OFF_T
 
+GETTEXT_PACKAGE=gnome-vfs-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
 ALL_LINGUAS="az ca da de el es fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ro ru sk sl sv tr uk wa zh_TW"
-AM_GNOME2_GETTEXT
+AM_GLIB_GNU_GETTEXT
 
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs)
Index: gnome-vfs/libgnomevfs/gnome-vfs-i18n.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-i18n.h,v
retrieving revision 1.1
diff -u -r1.1 gnome-vfs-i18n.h
--- gnome-vfs/libgnomevfs/gnome-vfs-i18n.h	2001/08/03 19:03:19	1.1
+++ gnome-vfs/libgnomevfs/gnome-vfs-i18n.h	2001/10/29 17:10:31
@@ -5,7 +5,7 @@
 #ifdef ENABLE_NLS
 #    include <libintl.h>
 #    undef _
-#    define _(String) dgettext (PACKAGE, String)
+#    define _(String) dgettext (GETTEXT_PACKAGE, String)
 #    ifdef gettext_noop
 #        define N_(String) gettext_noop (String)
 #    else

Index: libbonobo/.cvsignore
===================================================================
RCS file: /cvs/gnome/libbonobo/.cvsignore,v
retrieving revision 1.3
diff -u -r1.3 .cvsignore
--- libbonobo/.cvsignore	2001/05/30 07:18:24	1.3
+++ libbonobo/.cvsignore	2001/10/29 17:10:33
@@ -28,3 +28,4 @@
 COPYING
 .lclintrc
 xml-i18n-*
+intltool-*
Index: libbonobo/ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonobo/ChangeLog,v
retrieving revision 1.222
diff -u -r1.222 ChangeLog
--- libbonobo/ChangeLog	2001/10/29 10:47:21	1.222
+++ libbonobo/ChangeLog	2001/10/29 17:10:33
@@ -1,3 +1,19 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* monikers/Makefile.am (server_DATA): s/XML_I18N_TOOLS/INTLTOOL/
+
+	* bonobo/bonobo-main.c (bonobo_init_full): 
+	* bonobo/bonobo-exception.c (GNOME_EXPLICIT_TRANSLATION_DOMAIN):
+	use GETTEXT_PACKAGE
+
+	* configure.in: package is "libbonobo" not "libbonobo2",
+	intltoolize, use AM_GLIB_GNU_GETTEXT, and set GETTEXT_PACKAGE
+
+	* acconfig.h: add GETTEXT_PACKAGE
+
+	* Makefile.am (EXTRA_DIST): dist intltool things instead of
+	xml-i18n-foo
+
 2001-10-29  Seth Nickell  <snickell stanford edu>
 
 	* monikers/bonobo-moniker-query.h:
Index: libbonobo/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonobo/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- libbonobo/Makefile.am	2001/09/06 14:21:06	1.11
+++ libbonobo/Makefile.am	2001/10/29 17:10:33
@@ -5,7 +5,7 @@
 	libbonobo.h
 
 EXTRA_DIST = message-of-doom \
-	xml-i18n-extract.in  \
-	xml-i18n-merge.in    \
-	xml-i18n-update.in   \
+	intltool-extract.in  \
+	intltool-merge.in    \
+	intltool-update.in   \
 	changes.txt
Index: libbonobo/acconfig.h
===================================================================
RCS file: /cvs/gnome/libbonobo/acconfig.h,v
retrieving revision 1.3
diff -u -r1.3 acconfig.h
--- libbonobo/acconfig.h	2001/06/26 16:43:32	1.3
+++ libbonobo/acconfig.h	2001/10/29 17:10:33
@@ -6,3 +6,4 @@
 #undef HAVE_STPCPY
 #undef HAVE_DLADDR
 #undef ENABLE_ORBIT2
+#undef GETTEXT_PACKAGE
Index: libbonobo/configure.in
===================================================================
RCS file: /cvs/gnome/libbonobo/configure.in,v
retrieving revision 1.46
diff -u -r1.46 configure.in
--- libbonobo/configure.in	2001/10/13 16:00:07	1.46
+++ libbonobo/configure.in	2001/10/29 17:10:33
@@ -1,7 +1,7 @@
 AC_INIT(message-of-doom)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libbonobo2, 1.103.0)
+AM_INIT_AUTOMAKE(libbonobo, 1.103.0)
 
 AM_MAINTAINER_MODE
 
@@ -9,7 +9,7 @@
 dnl Due to the sed scripts being split on 90 line
 dnl blocks, this macro needs to be right at the beggining.
 dnl
-AM_PROG_XML_I18N_TOOLS
+AC_PROG_INTLTOOL
 
 GNOME_COMMON_INIT
 GNOME_PLATFORM_GNOME_2(yes, force)
@@ -20,6 +20,10 @@
 AM_PROG_LIBTOOL
 AC_PROG_YACC
 AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
+
+GETTEXT_PACKAGE=libbonobo-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
 ALL_LINGUAS="az ca es fr it nn no ru sk sv ta tr zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
Index: libbonobo/bonobo/bonobo-exception.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-exception.c,v
retrieving revision 1.29
diff -u -r1.29 bonobo-exception.c
--- libbonobo/bonobo/bonobo-exception.c	2001/10/25 01:33:39	1.29
+++ libbonobo/bonobo/bonobo-exception.c	2001/10/29 17:10:33
@@ -10,7 +10,7 @@
 #include <glib.h>
 #include <string.h>
 
-#define GNOME_EXPLICIT_TRANSLATION_DOMAIN PACKAGE
+#define GNOME_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
 #include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-shutdown.h>
Index: libbonobo/bonobo/bonobo-main.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-main.c,v
retrieving revision 1.56
diff -u -r1.56 bonobo-main.c
--- libbonobo/bonobo/bonobo-main.c	2001/10/26 05:33:41	1.56
+++ libbonobo/bonobo/bonobo-main.c	2001/10/29 17:10:33
@@ -231,7 +231,7 @@
 	bonobo_object_init ();
 	bonobo_context_init ();
 
-	bindtextdomain (PACKAGE, BONOBO_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, BONOBO_LOCALEDIR);
 
 	return TRUE;
 }
Index: libbonobo/monikers/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonobo/monikers/Makefile.am,v
retrieving revision 1.42
diff -u -r1.42 Makefile.am
--- libbonobo/monikers/Makefile.am	2001/10/05 11:09:19	1.42
+++ libbonobo/monikers/Makefile.am	2001/10/29 17:10:33
@@ -20,7 +20,7 @@
 serverdir = $(libdir)/bonobo/servers
 server_DATA = Bonobo_Moniker_std.server
 
- XML_I18N_MERGE_SERVER_RULE@
+ INTLTOOL_SERVER_RULE@
 
 monikerdir = $(libdir)/bonobo/monikers
 moniker_LTLIBRARIES = libmoniker_std_2.la
Index: libbonobo/samples/echo/ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonobo/samples/echo/ChangeLog,v
retrieving revision 1.21
diff -u -r1.21 ChangeLog
--- libbonobo/samples/echo/ChangeLog	2001/10/29 10:47:23	1.21
+++ libbonobo/samples/echo/ChangeLog	2001/10/29 17:10:33
@@ -1,3 +1,7 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* Makefile.am: s/XML_I18N_TOOLS/INTLTOOL/
+
 2001-10-29  Seth Nickell  <snickell stanford edu>
 
 	reviewed by: <delete if not using a buddy>
Index: libbonobo/samples/echo/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonobo/samples/echo/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- libbonobo/samples/echo/Makefile.am	2001/10/18 10:00:02	1.19
+++ libbonobo/samples/echo/Makefile.am	2001/10/29 17:10:33
@@ -38,7 +38,7 @@
 server_in_files = Bonobo_Sample_Echo.server.in
 server_DATA = $(server_in_files:.server.in=.server)
 
- XML_I18N_MERGE_SERVER_RULE@
+ INTLTOOL_SERVER_RULE@
 
 idldir    = $(datadir)/idl/bonobo-2.0
 idl_DATA  = Bonobo_Sample_Echo.idl

Index: libbonoboui/.cvsignore
===================================================================
RCS file: /cvs/gnome/libbonoboui/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- libbonoboui/.cvsignore	2001/08/08 22:15:01	1.2
+++ libbonoboui/.cvsignore	2001/10/29 17:10:35
@@ -28,3 +28,4 @@
 COPYING
 .lclintrc
 xml-i18n-*
+intltool-*
Index: libbonoboui/ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.148
diff -u -r1.148 ChangeLog
--- libbonoboui/ChangeLog	2001/10/29 10:36:42	1.148
+++ libbonoboui/ChangeLog	2001/10/29 17:10:35
@@ -1,3 +1,14 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* samples/controls/Makefile.am: use INTLTOOL rules
+
+	* configure.in: drop the 2 from the package name, use intltool,
+	set GETTEXT_PACKAGE, and use AM_GLIB_GNU_GETTEXT
+
+	* acconfig.h: add GETTEXT_PACKAGE
+
+	* Makefile.am (SUBDIRS): dist intltool-* rather than xml-i18n-*
+
 2001-10-28  Seth Nickell  <snickell stanford edu>
 
 	* bonobo/bonobo-canvas-component.c: (bonobo_canvas_component_new):
Index: libbonoboui/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- libbonoboui/Makefile.am	2001/10/24 19:18:29	1.11
+++ libbonoboui/Makefile.am	2001/10/29 17:10:35
@@ -7,7 +7,7 @@
 
 EXTRA_DIST = message-of-doom \
 	changes.txt          \
-	xml-i18n-extract.in  \
-	xml-i18n-merge.in    \
-	xml-i18n-update.in
+	intltool-extract.in  \
+	intltool-merge.in    \
+	intltool-update.in
 
Index: libbonoboui/acconfig.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/acconfig.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acconfig.h
--- libbonoboui/acconfig.h	2001/04/17 21:19:25	1.1.1.1
+++ libbonoboui/acconfig.h	2001/10/29 17:10:35
@@ -3,3 +3,4 @@
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
+#undef GETTEXT_PACKAGE
Index: libbonoboui/configure.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/configure.in,v
retrieving revision 1.35
diff -u -r1.35 configure.in
--- libbonoboui/configure.in	2001/10/24 19:18:29	1.35
+++ libbonoboui/configure.in	2001/10/29 17:10:35
@@ -1,7 +1,7 @@
 AC_INIT(message-of-doom)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libbonoboui2, 1.103.0)
+AM_INIT_AUTOMAKE(libbonoboui, 1.103.0)
 
 AM_MAINTAINER_MODE
 
@@ -9,7 +9,7 @@
 dnl Due to the sed scripts being split on 90 line
 dnl blocks, this macro needs to be right at the beggining.
 dnl
-AM_PROG_XML_I18N_TOOLS
+AC_PROG_INTLTOOL
 
 GNOME_COMMON_INIT
 GNOME_PLATFORM_GNOME_2(yes, force)
@@ -23,8 +23,12 @@
 
 GNOME_COMPILE_WARNINGS
 
+GETTEXT_PACKAGE=libbonoboui-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
 ALL_LINGUAS="az ca es fr it nn no ru sk sv ta tr wa zh_CN zh_TW"
-AM_GNOME2_GETTEXT
+AM_GLIB_GNU_GETTEXT
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
Index: libbonoboui/samples/compound-doc/bonobo-hello/ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/compound-doc/bonobo-hello/ChangeLog,v
retrieving revision 1.22
diff -u -r1.22 ChangeLog
--- libbonoboui/samples/compound-doc/bonobo-hello/ChangeLog	2001/10/29 10:48:27	1.22
+++ libbonoboui/samples/compound-doc/bonobo-hello/ChangeLog	2001/10/29 17:10:35
@@ -1,3 +1,7 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* Makefile.am: use INTLTOOL rules
+
 2001-10-29  Seth Nickell  <snickell stanford edu>
 
 	* bonobo-hello.c: (hello_embeddable_factory):
Index: libbonoboui/samples/compound-doc/bonobo-hello/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/compound-doc/bonobo-hello/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- libbonoboui/samples/compound-doc/bonobo-hello/Makefile.am	2001/08/18 21:13:12	1.10
+++ libbonoboui/samples/compound-doc/bonobo-hello/Makefile.am	2001/10/29 17:10:35
@@ -25,6 +25,6 @@
 server_in_files = Bonobo_Sample_Hello.server.in
 server_DATA = $(server_in_files:.server.in=.server)
 
- XML_I18N_MERGE_SERVER_RULE@
+ INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)
Index: libbonoboui/samples/controls/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/controls/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- libbonoboui/samples/controls/Makefile.am	2001/10/08 03:21:20	1.19
+++ libbonoboui/samples/controls/Makefile.am	2001/10/29 17:10:35
@@ -17,6 +17,6 @@
 server_in_files = Bonobo_Sample_Controls.server.in
 server_DATA = $(server_in_files:.server.in=.server)
 
- XML_I18N_MERGE_SERVER_RULE@
+ INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)

Index: libglade/ChangeLog
===================================================================
RCS file: /cvs/gnome/libglade/ChangeLog,v
retrieving revision 1.199
diff -u -r1.199 ChangeLog
--- libglade/ChangeLog	2001/10/27 18:02:35	1.199
+++ libglade/ChangeLog	2001/10/29 17:10:37
@@ -1,3 +1,9 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* configure.in: set GETTEXT_PACKAGE
+
+	* acconfig.h: add GETTEXT_PACKAGE
+
 2001-10-27  jacob berkman  <jacob ximian com>
 
 	* configure.in: 
Index: libglade/acconfig.h
===================================================================
RCS file: /cvs/gnome/libglade/acconfig.h,v
retrieving revision 1.10
diff -u -r1.10 acconfig.h
--- libglade/acconfig.h	2001/10/24 16:55:27	1.10
+++ libglade/acconfig.h	2001/10/29 17:10:37
@@ -5,3 +5,4 @@
 #undef WITH_GNOME
 #undef WITH_BONOBO
 #undef WITH_CANVAS
+#undef GETTEXT_PACKAGE
Index: libglade/configure.in
===================================================================
RCS file: /cvs/gnome/libglade/configure.in,v
retrieving revision 1.60
diff -u -r1.60 configure.in
--- libglade/configure.in	2001/10/27 18:02:35	1.60
+++ libglade/configure.in	2001/10/29 17:10:37
@@ -39,6 +39,10 @@
 
 dnl gettext stuff ... there is no message catalog for libglade -- libglade
 dnl provides translation for the XML files it reads in.
+GETTEXT_PACKAGE=libglade-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
 ALL_LINGUAS=""
 AM_GLIB_GNU_GETTEXT

Index: libgnome/.cvsignore
===================================================================
RCS file: /cvs/gnome/libgnome/.cvsignore,v
retrieving revision 1.5
diff -u -r1.5 .cvsignore
--- libgnome/.cvsignore	2001/09/26 05:30:49	1.5
+++ libgnome/.cvsignore	2001/10/29 17:10:39
@@ -33,12 +33,8 @@
 .lclintrc
 libvfs
 compatConf.sh
-libgnome2-*.tar.gz
+libgnome-*.tar.gz
 deptree
-xml-i18n-extract
-xml-i18n-merge
-xml-i18n-merge.in
-xml-i18n-update
-xml-i18n-extract.in
-xml-i18n-update.in
+xml-i18n-*
 sgml
+intltool-*
Index: libgnome/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnome/ChangeLog,v
retrieving revision 1.81
diff -u -r1.81 ChangeLog
--- libgnome/ChangeLog	2001/10/24 17:24:37	1.81
+++ libgnome/ChangeLog	2001/10/29 17:10:39
@@ -1,3 +1,12 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* Makefile.am (EXTRA_DIST): add intltool stuff
+
+	* configure.in: drop the 2 from the package name, use intltool,
+	define GETTEXT_PACKAGE, use and AM_GLIB_GNU_GETTEXT
+
+	* acconfig.h: add GETTEXT_PACKAGE
+
 2001-10-24  jacob berkman  <jacob ximian com>
 
 	* configure.in: don't fail if esound / audiofile aren't found (and
Index: libgnome/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgnome/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- libgnome/Makefile.am	2001/09/18 18:25:55	1.18
+++ libgnome/Makefile.am	2001/10/29 17:10:39
@@ -1,4 +1,7 @@
 SUBDIRS = libgnome po doc
 
 EXTRA_DIST = message-of-doom COPYING.LIB
+	intltool-extract.in  \
+	intltool-merge.in    \
+	intltool-update.in
 
Index: libgnome/acconfig.h
===================================================================
RCS file: /cvs/gnome/libgnome/acconfig.h,v
retrieving revision 1.10
diff -u -r1.10 acconfig.h
--- libgnome/acconfig.h	2001/09/02 18:39:49	1.10
+++ libgnome/acconfig.h	2001/10/29 17:10:39
@@ -16,3 +16,5 @@
 #undef HAVE_SETFSGID
 #undef HAVE_SYS_FSUID_H
 #undef HAVE_ALLOCA_H
+#undef GETTEXT_PACKAGE
+
Index: libgnome/configure.in
===================================================================
RCS file: /cvs/gnome/libgnome/configure.in,v
retrieving revision 1.74
diff -u -r1.74 configure.in
--- libgnome/configure.in	2001/10/24 17:24:37	1.74
+++ libgnome/configure.in	2001/10/29 17:10:39
@@ -1,7 +1,7 @@
 AC_INIT(libgnome)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libgnome2, 1.104.0)
+AM_INIT_AUTOMAKE(libgnome, 1.104.0)
 
 AM_MAINTAINER_MODE
 
@@ -9,7 +9,7 @@
 dnl Due to the sed scripts being split on 90 line
 dnl blocks, this macro needs to be right at the beggining.
 dnl
-AM_PROG_XML_I18N_TOOLS
+AC_PROG_INTLTOOL
 
 GNOME_PLUGIN_SERIAL=3
 AC_DEFINE_UNQUOTED(GNOME_PLUGIN_SERIAL, $GNOME_PLUGIN_SERIAL, [Serial number, incremented each time we do a binary incompatible change])
@@ -27,8 +27,12 @@
 AC_CHECK_FUNCS([setenv unsetenv clearenv setfsgid])
 AC_CHECK_HEADERS(sys/fsuid.h)
 
+GETTEXT_PACKAGE=libgnome-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
 ALL_LINGUAS="az es fr it nn no ru sk sv ta tr wa zh_TW"
-AM_GNOME2_GETTEXT
+AM_GLIB_GNU_GETTEXT
 gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
 AC_SUBST(gnomelocaledir)
 
Index: libgnome/libgnome/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/ChangeLog,v
retrieving revision 1.362
diff -u -r1.362 ChangeLog
--- libgnome/libgnome/ChangeLog	2001/10/25 05:20:51	1.362
+++ libgnome/libgnome/ChangeLog	2001/10/29 17:10:39
@@ -1,3 +1,10 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* gnome-init.c: use GETTEXT_PACKAGE where appropriate
+
+	* gnome-i18nP.h (GNOME_EXPLICIT_TRANSLATION_DOMAIN): use
+	GETTEXT_PACKAGE
+
 2001-10-26  Michael Meeks  <michael ximian com>
 
 	* libgnome.schema: add menus-have-icons, so we get some icons.
Index: libgnome/libgnome/gnome-i18nP.h
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-i18nP.h,v
retrieving revision 1.16
diff -u -r1.16 gnome-i18nP.h
--- libgnome/libgnome/gnome-i18nP.h	2001/09/04 00:47:49	1.16
+++ libgnome/libgnome/gnome-i18nP.h	2001/10/29 17:10:39
@@ -33,7 +33,7 @@
 #define __GNOME_I18NP_H__ 1
 
 #ifndef GNOME_EXPLICIT_TRANSLATION_DOMAIN
-#  define GNOME_EXPLICIT_TRANSLATION_DOMAIN PACKAGE
+#  define GNOME_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
 #endif
 #include "gnome-i18n.h"
 
Index: libgnome/libgnome/gnome-init.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-init.c,v
retrieving revision 1.92
diff -u -r1.92 gnome-init.c
--- libgnome/libgnome/gnome-init.c	2001/09/28 15:33:43	1.92
+++ libgnome/libgnome/gnome-init.c	2001/10/29 17:10:39
@@ -346,11 +346,11 @@
 
 	setlocale (LC_ALL, "");
 	/* XXX todo - handle multiple installation dirs */
-	bindtextdomain (PACKAGE, LIBGNOME_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LIBGNOME_LOCALEDIR);
 }
 
 static struct poptOption gnomelib_options [] = {
-	{ NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
+	{ NULL, '\0', POPT_ARG_INTL_DOMAIN, GETTEXT_PACKAGE, 0, NULL, NULL},
 
 	{ NULL, '\0', POPT_ARG_CALLBACK, (void *) libgnome_option_cb, 0, NULL, NULL},

Index: libgnomecanvas/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/ChangeLog,v
retrieving revision 1.40
diff -u -r1.40 ChangeLog
--- libgnomecanvas/ChangeLog	2001/10/28 22:19:21	1.40
+++ libgnomecanvas/ChangeLog	2001/10/29 17:10:40
@@ -1,3 +1,10 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* configure.in: drop the 2 from the package name, set
+	GETTEXT_PACKAGE
+
+	* acconfig.h: set GETTEXT_PACKAGE
+
 2001-10-29  Michael Meeks  <michael ximian com>
 
 	* configure.in: depend on the latest gtk+ and pango.
Index: libgnomecanvas/acconfig.h
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/acconfig.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acconfig.h
--- libgnomecanvas/acconfig.h	2001/03/21 11:49:10	1.1.1.1
+++ libgnomecanvas/acconfig.h	2001/10/29 17:10:40
@@ -4,3 +4,4 @@
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
+#undef GETTEXT_PACKAGE
Index: libgnomecanvas/configure.in
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/configure.in,v
retrieving revision 1.36
diff -u -r1.36 configure.in
--- libgnomecanvas/configure.in	2001/10/28 22:19:21	1.36
+++ libgnomecanvas/configure.in	2001/10/29 17:10:40
@@ -2,7 +2,7 @@
 AC_INIT(libgnomecanvas)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libgnomecanvas2, 1.104.0)
+AM_INIT_AUTOMAKE(libgnomecanvas, 1.104.0)
 
 AM_MAINTAINER_MODE
 
@@ -17,6 +17,10 @@
 AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
 
 GNOME_COMPILE_WARNINGS
+
+GETTEXT_PACKAGE=libgnomecanvas-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
 ALL_LINGUAS="az es fr it nn no ru sk sv ta tr wa zh_TW"
 AM_GLIB_GNU_GETTEXT

Index: libgnomeui/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomeui/ChangeLog,v
retrieving revision 1.53
diff -u -r1.53 ChangeLog
--- libgnomeui/ChangeLog	2001/10/25 00:34:01	1.53
+++ libgnomeui/ChangeLog	2001/10/29 17:10:42
@@ -1,3 +1,10 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* configure.in: drop the 2 from the package name, and set
+	GETTEXT_PACKAGE
+
+	* acconfig.h: add GETTEXT_PACKAGE
+
 2001-10-24  jacob berkman  <jacob ximian com>
 
 	* glade/glade-gnome.c: (file_entry_find_internal_child): fix a
Index: libgnomeui/acconfig.h
===================================================================
RCS file: /cvs/gnome/libgnomeui/acconfig.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acconfig.h
--- libgnomeui/acconfig.h	2001/03/21 11:49:48	1.1.1.1
+++ libgnomeui/acconfig.h	2001/10/29 17:10:42
@@ -4,3 +4,4 @@
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
+#undef GETTEXT_PACKAGE
Index: libgnomeui/configure.in
===================================================================
RCS file: /cvs/gnome/libgnomeui/configure.in,v
retrieving revision 1.46
diff -u -r1.46 configure.in
--- libgnomeui/configure.in	2001/10/24 19:18:29	1.46
+++ libgnomeui/configure.in	2001/10/29 17:10:42
@@ -1,7 +1,7 @@
 AC_INIT(libgnomeui)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libgnomeui2, 1.104.0)
+AM_INIT_AUTOMAKE(libgnomeui, 1.104.0)
 
 AM_MAINTAINER_MODE
 
@@ -14,6 +14,10 @@
 AM_PROG_LIBTOOL
 AC_PROG_YACC
 AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
+
+GETTEXT_PACKAGE=libgnomeui-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
 ALL_LINGUAS="az es fr it nn no ru sv ta tr wa zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
Index: libgnomeui/libgnomeui/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/ChangeLog,v
retrieving revision 1.1708
diff -u -r1.1708 ChangeLog
--- libgnomeui/libgnomeui/ChangeLog	2001/10/28 05:50:36	1.1708
+++ libgnomeui/libgnomeui/ChangeLog	2001/10/29 17:10:42
@@ -1,3 +1,16 @@
+2001-10-29  jacob berkman  <jacob ximian com>
+
+	* gnome_segv.c (main): use GETTEXT_PACKAGE
+
+	* gnome-ui-init.c: use GETTEXT_PACKAGE
+
+	* gnome-stock-icons.c: remove GETTEXT_PACKAGE definition
+
+	* gnome-i18nP.h (GNOME_EXPLICIT_TRANSLATION_DOMAIN): use
+	GETTEXT_PACKAGE
+
+	* gnome-client.c: use GETTEXT_PACKAGE where appropriate
+
 2001-10-28  jacob berkman  <jacob ximian com>
 
 	* gnome-ui-init.c (libgnomeui_segv_handle): pass
Index: libgnomeui/libgnomeui/gnome-app-helper.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-app-helper.c,v
retrieving revision 1.176
diff -u -r1.176 gnome-app-helper.c
--- libgnomeui/libgnomeui/gnome-app-helper.c	2001/10/10 02:46:24	1.176
+++ libgnomeui/libgnomeui/gnome-app-helper.c	2001/10/29 17:10:43
@@ -2485,7 +2485,7 @@
 
         s = gettext (str);
 	if ( s == str )
-	        s = dgettext (PACKAGE, str);
+	        s = dgettext (GETTEXT_PACKAGE, str);
 
 	return s;
 }
Index: libgnomeui/libgnomeui/gnome-app-helper.h
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-app-helper.h,v
retrieving revision 1.86
diff -u -r1.86 gnome-app-helper.h
--- libgnomeui/libgnomeui/gnome-app-helper.h	2001/08/27 02:35:21	1.86
+++ libgnomeui/libgnomeui/gnome-app-helper.h	2001/10/29 17:10:43
@@ -501,7 +501,7 @@
 const gchar * gnome_app_helper_gettext (const gchar *string);
 
 #ifdef ENABLE_NLS
-#define D_(x) dgettext (PACKAGE, x)
+#define D_(x) dgettext (GETTEXT_PACKAGE, x)
 #define L_(x) gnome_app_helper_gettext(x)
 #else
 #define D_(x) x
Index: libgnomeui/libgnomeui/gnome-client.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-client.c,v
retrieving revision 1.112
diff -u -r1.112 gnome-client.c
--- libgnomeui/libgnomeui/gnome-client.c	2001/09/28 23:03:08	1.112
+++ libgnomeui/libgnomeui/gnome-client.c	2001/10/29 17:10:43
@@ -828,7 +828,7 @@
 /* Command-line arguments understood by this module.  */
 enum { ARG_SM_CLIENT_ID=1, ARG_SM_CONFIG_PREFIX, ARG_SM_DISABLE };
 static const struct poptOption options[] = {
-  {NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
+  {NULL, '\0', POPT_ARG_INTL_DOMAIN, GETTEXT_PACKAGE, 0, NULL, NULL},
 
   {NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_PRE | POPT_CBFLAG_POST, 
    client_parse_func, 0, NULL, NULL},
Index: libgnomeui/libgnomeui/gnome-i18nP.h
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-i18nP.h,v
retrieving revision 1.5
diff -u -r1.5 gnome-i18nP.h
--- libgnomeui/libgnomeui/gnome-i18nP.h	2001/09/04 15:48:44	1.5
+++ libgnomeui/libgnomeui/gnome-i18nP.h	2001/10/29 17:10:43
@@ -33,7 +33,7 @@
 #define __GNOME_I18NP_H__ 1
 
 #ifndef GNOME_EXPLICIT_TRANSLATION_DOMAIN
-#  define GNOME_EXPLICIT_TRANSLATION_DOMAIN PACKAGE
+#  define GNOME_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
 #endif
 #include <libgnome/gnome-i18n.h>
 
Index: libgnomeui/libgnomeui/gnome-stock-icons.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-stock-icons.c,v
retrieving revision 1.17
diff -u -r1.17 gnome-stock-icons.c
--- libgnomeui/libgnomeui/gnome-stock-icons.c	2001/10/11 10:20:28	1.17
+++ libgnomeui/libgnomeui/gnome-stock-icons.c	2001/10/29 17:10:43
@@ -33,10 +33,6 @@
 #include <libgnomeui/gnome-stock-icons.h>
 #include "pixmaps/gnome-stock-pixbufs.h"
 
-#ifndef GETTEXT_PACKAGE
-#define GETTEXT_PACKAGE PACKAGE
-#endif
-
 /* Prototype for a private function */
 void _gnome_stock_icons_init (void);
 
Index: libgnomeui/libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.163
diff -u -r1.163 gnome-ui-init.c
--- libgnomeui/libgnomeui/gnome-ui-init.c	2001/10/28 05:50:37	1.163
+++ libgnomeui/libgnomeui/gnome-ui-init.c	2001/10/29 17:10:43
@@ -87,7 +87,7 @@
 enum { ARG_DISABLE_CRASH_DIALOG=1, ARG_DISPLAY };
 
 static struct poptOption libgnomeui_options[] = {
-        {NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
+        {NULL, '\0', POPT_ARG_INTL_DOMAIN, GETTEXT_PACKAGE, 0, NULL, NULL},
 	{NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST,
 	 &libgnomeui_arg_callback, 0, NULL, NULL},
 	{"disable-crash-dialog", '\0', POPT_ARG_NONE, NULL, ARG_DISABLE_CRASH_DIALOG},
@@ -602,7 +602,7 @@
 	{ NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_PRE,
 	  &add_gtk_arg_callback, 0, NULL, NULL },
 
-	{ NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL },
+	{ NULL, '\0', POPT_ARG_INTL_DOMAIN, GETTEXT_PACKAGE, 0, NULL, NULL },
 
 	{ "gdk-debug", '\0', POPT_ARG_STRING, NULL, 0,
 	  N_("Gdk debugging flags to set"), N_("FLAGS")},
Index: libgnomeui/libgnomeui/gnome_segv.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome_segv.c,v
retrieving revision 1.38
diff -u -r1.38 gnome_segv.c
--- libgnomeui/libgnomeui/gnome_segv.c	2001/09/19 19:17:36	1.38
+++ libgnomeui/libgnomeui/gnome_segv.c	2001/10/29 17:10:43
@@ -74,8 +74,8 @@
   sigaction(SIGSEGV, &sa, NULL);
 
 
-  bindtextdomain (PACKAGE, GNOMEUILOCALEDIR);
-  textdomain (PACKAGE);
+  bindtextdomain (GETTEXT_PACKAGE, GNOMEUILOCALEDIR);
+  textdomain (GETTEXT_PACKAGE);
 
   /* in case gnome-session is segfaulting :-) */
   gnome_client_disable_master_connection();

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]