diff options
| -rw-r--r-- | e-util/ChangeLog | 7 | ||||
| -rw-r--r-- | e-util/e-host-utils.c | 2 | ||||
| -rw-r--r-- | e-util/ename/e-name-western.c | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 91663ac928..8a853eb743 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,5 +1,12 @@ 2001-10-29 Christopher James Lahey <clahey@ximian.com> + * ename/e-name-western.c (e_name_western_fixup): Added French + conjunction. + + * e-host-utils.c: Don't define gethost_mutex unless we need it. + +2001-10-29 Christopher James Lahey <clahey@ximian.com> + * ename/e-name-western.c: Cleaned this up a bit. 2001-10-29 Christopher James Lahey <clahey@ximian.com> diff --git a/e-util/e-host-utils.c b/e-util/e-host-utils.c index 1b97c2e3f3..ab1b1cc0d6 100644 --- a/e-util/e-host-utils.c +++ b/e-util/e-host-utils.c @@ -28,7 +28,9 @@ #include <stdio.h> #include <errno.h> +#ifndef HAVE_GETHOSTBYNAME_R G_LOCK_DEFINE_STATIC (gethost_mutex); +#endif /** * e_gethostbyname_r: diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c index e6bd333e3c..c016533d91 100644 --- a/e-util/ename/e-name-western.c +++ b/e-util/ename/e-name-western.c @@ -846,6 +846,9 @@ e_name_western_fixup (ENameWestern *name, ENameWesternIdxs *idxs) /* Finnish */ CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("ja"); + /* French */ + CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("et"); + /* Russian */ CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("\xd0\x98"); /* u+0418 */ CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("\xd0\xb8"); /* u+0438 */ |