summaryrefslogtreecommitdiff
path: root/atk
diff options
context:
space:
mode:
authorPadraig O'Briain <padraig.obriain@sun.com>2004-01-05 13:52:01 +0000
committerPadraig O'Briain <padraigo@src.gnome.org>2004-01-05 13:52:01 +0000
commit0946edd4074942c99d2c0d4a008b2addcb66ff10 (patch)
treee3eceddb425cb6a8e14c57a7754b7d7d63dd0bf9 /atk
parentca4adc2bc1b8f82c6e37ced3db68afce1d79695d (diff)
downloadatk-0946edd4074942c99d2c0d4a008b2addcb66ff10.tar.gz
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.
Diffstat (limited to 'atk')
-rw-r--r--atk/Makefile.am3
-rwxr-xr-xatk/atkobject.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/atk/Makefile.am b/atk/Makefile.am
index d982be1..e768029 100644
--- 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
--- 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