diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | e-util/ChangeLog | 7 | ||||
-rw-r--r-- | e-util/e-pilot-util.c | 4 |
4 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2001-12-10 JP Rosevear <jpr@ximian.com> + + * configure.in: use UTF-8 as the char set when testing pilot link + 2001-12-11 Ettore Perazzoli <ettore@ximian.com> * data/evolution.desktop.in (_Name): "Ximian Evolution", not diff --git a/configure.in b/configure.in index fcbe7c6f8c..1bbf90401c 100644 --- a/configure.in +++ b/configure.in @@ -677,7 +677,7 @@ int main (int argc, char **argv) size_t utf8_real_len = strlen (utf8); char *pstring; - if (convert_ToPilotChar ("UTF8", utf8, utf8_real_len, &pstring) == -1) + if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1) exit (1); exit (0); diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 9b0f4d0ec1..1b7dcf1da4 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2001-12-10 JP Rosevear <jpr@ximian.com> + + * e-pilot-util.c (e_pilot_utf8_to_pchar): use UTF-8 instead of + UTF8 as the source char set + (e_pilot_utf8_from_pchar): use UTF-8 instead of UTF8 as the + destination char set + 2001-11-20 Dan Winship <danw@ximian.com> * e-passwords.c (e_passwords_forget_password): Clear the password diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c index 3846c2fe7f..c1da384317 100644 --- a/e-util/e-pilot-util.c +++ b/e-util/e-pilot-util.c @@ -36,7 +36,7 @@ e_pilot_utf8_to_pchar (const char *string) if (!string) return NULL; - res = convert_ToPilotChar ("UTF8", string, strlen (string), &pstring); + res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring); if (res != 0) pstring = strdup (string); @@ -53,7 +53,7 @@ e_pilot_utf8_from_pchar (const char *string) if (!string) return NULL; - res = convert_FromPilotChar ("UTF8", string, strlen (string), &ustring); + res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring); if (res != 0) ustring = strdup (string); |