[monkey-bubble: 141/753] Removed; this is now in libgnomebase/libgnomebase.

[Sven Herzberg <herzi src gnome org>]

commit e1c3f47e0124214d0f203e87844da5c3d76f987b
Author: Martin Baulig <baulig suse de>
Date:   Sun Apr 15 14:50:29 2001 +0000

    Removed; this is now in libgnomebase/libgnomebase.
    
    2001-04-15  Martin Baulig  <baulig suse de>
    
    	* gnome-program.[ch]: Removed; this is now in libgnomebase/libgnomebase.
    
    	* gnome-defs.h, gnome-i18n.h: Removed; this is now in libgnomebase/libgnomebase.

 libgnome/ChangeLog       |    8 +
 libgnome/Makefile.am     |   17 +-
 libgnome/gnome-defs.h    |   32 --
 libgnome/gnome-i18n.h    |  123 ----
 libgnome/gnome-i18nP.h   |   81 ++-
 libgnome/gnome-program.c | 1384 ----------------------------------------------
 libgnome/gnome-program.h |  214 -------
 7 files changed, 71 insertions(+), 1788 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index ac0eb6a..be2ce12 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-15  Martin Baulig  <baulig suse de>
+
+	* gnome-program.[ch]: Removed; this is now in libgnomebase/libgnomebase.
+
+	* gnome-defs.h, gnome-i18n.h: Removed; this is now in libgnomebase/libgnomebase.
+
+	* gnome-i18nP.h: Moved all the external declarations from gnome-i18n.h here.
+
 2001-04-14  Martin Baulig  <baulig suse de>
 
 	* gnome-program.h (GNOME_PARAM_GCONF_CLIENT): New GnomeProgram property.
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 9d982b4..926554f 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -7,9 +7,6 @@
 LIB_VERSION=0:0:0
 LIB_VERSION_NUM=0.0.0
 
-GNOME_MAKEENUMS = $(top_srcdir)/tools/gnome-makeenums.pl
-GNOME_MAKETYPES = $(top_builddir)/tools/gnome-maketypes.awk
-
 lib_LTLIBRARIES = libgnome-2.la
 
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -20,7 +17,7 @@ INCLUDES = \
 	-I..					\
 	-I$(srcdir)/..				\
 	$(WARN_CFLAGS)				\
-	$(GNOMESUPPORT_CFLAGS)			\
+	$(LIBGNOMEBASE_CFLAGS)			\
 	$(GLIB_CFLAGS)				\
 	$(OAF_CFLAGS)				\
 	$(GCONF_CFLAGS)				\
@@ -39,7 +36,6 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gnome\"
 
 libgnome_2_la_SOURCES = \
-	gnome-program.c		\
 	gnome-config.c		\
 	gnome-ditem.c		\
 	gnome-exec.c		\
@@ -56,13 +52,10 @@ libgnome_2_la_SOURCES = \
 	libgnometypes.c
 
 libgnome_headers = \
-	gnome-program.h		\
         gnome-config.h 		\
-	gnome-defs.h   		\
 	gnome-fileconvert.h	\
 	gnome-ditem.h		\
 	gnome-exec.h		\
-	gnome-i18n.h 		\
 	gnome-regex.h		\
 	gnome-remote.h		\
 	gnome-score.h		\
@@ -70,15 +63,13 @@ libgnome_headers = \
 	gnome-url.h		\
 	gnome-util.h   		\
 	gnome-paper.h		\
-	libgnome.h		\
-	gnome-portability.h
+	libgnome.h
 
 libgnomeinclude_HEADERS = \
 	libgnometypebuiltins.h	\
 	$(libgnome_headers)
 
 noinst_HEADERS = \
-	gnome-i18nP.h				\
 	gnome-triggersP.h			\
 	libgnomeP.h
 
@@ -115,11 +106,9 @@ libgnometypebuiltins_evals.c: $(GNOME_MAKEENUMS) libgnome.defs
 
 EXTRA_DIST = \
 	parse-path.cP			\
-	gnome-portability.h.in		\
 	libgnome-2.0.pc.in
 
 BUILT_SOURCES = \
-	gnome-portability.h		\
 	libgnometypebuiltins.h		\
 	libgnometypebuiltins_evals.c	\
 	libgnometypebuiltins_ids.c	\
@@ -130,7 +119,7 @@ gnome-config.o: parse-path.cP
 
 libgnome_2_la_LDFLAGS = -version-info $(LIB_VERSION)
 libgnome_2_la_LIBADD =		\
-	$(GNOMESUPPORT_LIBS)	\
+	$(LIBGNOMEBASE_LIBS)	\
 	$(OAF_LIBS)		\
 	$(GCONF_LIBS)		\
 	$(LIBXML_LIBS)		\
diff --git a/libgnome/gnome-i18nP.h b/libgnome/gnome-i18nP.h
index 4021cd4..9e03e87 100644
--- a/libgnome/gnome-i18nP.h
+++ b/libgnome/gnome-i18nP.h
@@ -32,26 +32,65 @@
 #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)
-#endif
-
-#include "libgnome/gnome-i18n.h"
+#include <libgnomebase/gnome-defs.h>
+#include <libgnomebase/gnome-i18n.h>
+
+BEGIN_GNOME_DECLS
+
+const char *	gnome_i18n_get_language			(void);
+
+/* 'gnome_i18n_get_language_list' returns a list of language strings.
+ *
+ * It searches for one of following environment variables:
+ * LANGUAGE
+ * LC_ALL
+ * 'category_name'
+ * LANG
+ *
+ * If one of these environment variables was found, it is split into
+ * pieces, whereever a ':' is found. When the environment variable included
+ * no C locale, the C locale is appended to the list of languages.
+ *
+ * Assume, you have the following environment variables set:
+ *
+ * LC_MONETARY="de_DE:es"
+ * LANG="de_DE:de:C:en"
+ * 
+ * In this case 'gnome_i18n_get_language_list ("LC_COLLATE")' returns the
+ * list: ("de_DE" "de" "C" "en").
+ *
+ * 'gnome_i18n_get_language_list ("LC_MONETARY")' returns:
+ * ("de_DE" "es" "C")
+ *
+ * The returned list must not be changed.
+ */
+
+const GList *	gnome_i18n_get_language_list		(const gchar *category_name);
+
+/* `gnome_i18n_set_preferred_language' sets the preferred language in
+   the config database.  The value VAL should be a language name like
+   `fr'.  */
+void		gnome_i18n_set_preferred_language	(const char *val);
+
+/* `gnome_i18n_get_preferred_language' returns the preferred language
+   name.  It will return NULL if no preference is set.  */
+char *		gnome_i18n_get_preferred_language	(void);
+
+/* Push "C" numeric locale.  Do this before doing any floating
+ * point to/from string conversions, if those are to be done in
+ * a portable manner.  This is a hack really, and there is
+ * no need to generalize it to other cathegories.  But it is
+ * needed whenever things like printing scanning floats from or
+ * to files or other places where you'd like to read them back
+ * later. */
+void		gnome_i18n_push_c_numeric_locale	(void);
+void		gnome_i18n_pop_c_numeric_locale		(void);
+
+/* `gnome_i18n_init' initializes the i18n environment variables from
+   the preferences in the config database.  It ordinarily should not
+   be called by user code.  */
+void		gnome_i18n_init				(void);
+
+END_GNOME_DECLS
 
 #endif /* __GNOME_I18NP_H__ */