summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2003-06-13 20:57:47 +0000
committerTor Lillqvist <tml@src.gnome.org>2003-06-13 20:57:47 +0000
commit9716d1c2d3c84c388083e08a94f74284811825e1 (patch)
treec393a542393b32bd1dc463da6e1a1307fdc96c7a
parent7a8f049ea7f5892a316d4359fcd30140a612678d (diff)
downloadatk-9716d1c2d3c84c388083e08a94f74284811825e1.tar.gz
Set gettext_initialized.
2003-06-13 Tor Lillqvist <tml@iki.fi> * atk/atkobject.c (atk_role_get_localized_name): Set gettext_initialized. * atk-zip.sh.in (DEVZIP): libtool 1.5 installs DLLs in the bin directory, so look there, too. Include the message catalogs.
-rw-r--r--ChangeLog8
-rwxr-xr-xatk-zip.sh.in12
-rwxr-xr-xatk/atkobject.c2
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cbd521..4b92163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-13 Tor Lillqvist <tml@iki.fi>
+
+ * atk/atkobject.c (atk_role_get_localized_name): Set
+ gettext_initialized.
+
+ * atk-zip.sh.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+ directory, so look there, too. Include the message catalogs.
+
2003-06-10 Padraig O'Briain <padraig.obriain@sun.com>
* configure.in: Version 1.3.4, interface age 0, binary age 304
diff --git a/atk-zip.sh.in b/atk-zip.sh.in
index 68bf2f1..21242c0 100755
--- a/atk-zip.sh.in
+++ b/atk-zip.sh.in
@@ -4,13 +4,19 @@
ZIP=/tmp/atk-@ATK_VERSION@-`date +%Y%m%d`.zip
DEVZIP=/tmp/atk-dev-@ATK_VERSION@-`date +%Y%m%d`.zip
-cd @prefix@
+cd @prefix@
rm $ZIP
-zip -r $ZIP -@ <<EOF
-lib/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+
+DLLDIR=lib
+[ -f bin/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
+
+zip $ZIP -@ <<EOF
+$DLLDIR/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
EOF
+zip $ZIP lib/locale/*/LC_MESSAGES/atk10.mo
+
rm $DEVZIP
zip -r $DEVZIP -@ <<EOF
include/atk-1.0
diff --git a/atk/atkobject.c b/atk/atkobject.c
index 31bbc65..5f25af5 100755
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -1229,6 +1229,8 @@ atk_role_get_localized_name (AtkRole role)
#ifdef ENABLE_NLS
if (!gettext_initialized)
{
+ gettext_initialized = TRUE;
+
bindtextdomain (GETTEXT_PACKAGE, ATKLOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");