Move specification of ALL_LINGUAS to later in file so that CATOBJEXT is

2004-01-05  Padraig O'Briain  <padraig.obriain@sun.com>

	* configure.in: Move specification of ALL_LINGUAS to later in file
	so that CATOBJEXT is defined correctly.
	Use ATK_LOCALEDIR instead of atklocaledir.

	* atk/Makefile.am: Remove definition of ATKLOCALEDIR.

	* atk/atkobject.c: Use ATK_LOCALEDIR instead of ATKLOCALEDIR.

	* docs/tmpl/atkhyperlink.sgml: Add text for link-activated signal.

diff --git a/atk/Makefile.am b/atk/Makefile.am
index d982be1..e768029 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -5,8 +5,7 @@ GPATH = $(srcdir)
 INCLUDES = \
        -I$(top_srcdir)         \
        -DG_DISABLE_DEPRECATED  \
-       $(DEP_CFLAGS)           \
-       -DATKLOCALEDIR=\""$(atklocaledir)"\"
+       $(DEP_CFLAGS)
 
 lib_LTLIBRARIES = libatk-1.0.la
 

diff --git a/atk/atkobject.c b/atk/atkobject.c
index dea5b8f..88cb6bb 100755 (executable)
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -1285,9 +1285,9 @@ atk_role_get_name (AtkRole role)
 
 #ifdef G_OS_WIN32
 
-#undef ATKLOCALEDIR
+#undef ATK_LOCALEDIR
 
-#define ATKLOCALEDIR get_atk_locale_dir()
+#define ATK_LOCALEDIR get_atk_locale_dir()
 
 G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
 
@@ -1320,7 +1320,7 @@ atk_role_get_localized_name (AtkRole role)
     {
       gettext_initialized = TRUE;
 
-      bindtextdomain (GETTEXT_PACKAGE, ATKLOCALEDIR);
+      bindtextdomain (GETTEXT_PACKAGE, ATK_LOCALEDIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif

diff --git a/configure.in b/configure.in
index 9faf0cd..59e09ca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -86,13 +86,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
   [Define the gettext package to be used])
 
-ALL_LINGUAS="af am az be bg bn ca cs cy da de en_GB el eo es fa fi fr ga he hi hu kn ko id is it ja li lv lt ml mk mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi yi zh_CN zh_TW"
-AM_GLIB_GNU_GETTEXT
-
-GLIB_DEFINE_LOCALEDIR(atklocaledir)
-
-AC_CHECK_FUNCS(bind_textdomain_codeset)
-
 AC_PROG_CC
 AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
@@ -158,6 +151,12 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
 # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
+ALL_LINGUAS="af am az be bg bn ca cs cy da de en_GB el eo es fa fi fr ga he hi hu kn ko id is it ja li lv lt ml mk mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi yi zh_CN zh_TW"
+AM_GLIB_GNU_GETTEXT
+
+AM_GLIB_DEFINE_LOCALEDIR(ATK_LOCALEDIR)
+
+AC_CHECK_FUNCS(bind_textdomain_codeset)
 
 GTK_DOC_CHECK([1.0])
 

diff --git a/docs/tmpl/atkhyperlink.sgml b/docs/tmpl/atkhyperlink.sgml
index 1e00fef..6489483 100644 (file)
--- a/docs/tmpl/atkhyperlink.sgml
+++ b/docs/tmpl/atkhyperlink.sgml
@@ -24,7 +24,7 @@ The AtkHyperlink structure should not be accessed directly.
 
 <!-- ##### SIGNAL AtkHyperlink::link-activated ##### -->
 <para>
-
+The signal link-activated is emitted when a link is activated.
 </para>
 
 @atkhyperlink: the object which received the signal.