diff options
| author | Jeff Cai <jeff.cai@sun.com> | 2009-11-30 18:04:18 +0800 |
|---|---|---|
| committer | Jeff Cai <jeff.cai@sun.com> | 2009-11-30 18:11:36 +0800 |
| commit | 9cd8dede8bd6eac41f7486d95336909051d9b4c2 (patch) | |
| tree | d5973656d5a1c94fb3ad012f772cc2317e1ea8b2 /e-util | |
| parent | e3561c50baeaf9d7f24892c3e72cd46eab91d111 (diff) | |
| download | gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.gz gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.zst gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.zip | |
Fixed bug 364618, solve the chinese character issue.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-pilot-util.c | 18 | ||||
| -rw-r--r-- | e-util/e-pilot-util.h | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c index 94c86a1084..3ce67c8e7b 100644 --- a/e-util/e-pilot-util.c +++ b/e-util/e-pilot-util.c @@ -31,7 +31,7 @@ #include "e-pilot-util.h" gchar * -e_pilot_utf8_to_pchar (const gchar *string) +e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset) { gchar *pstring = NULL; gint res; @@ -39,7 +39,12 @@ e_pilot_utf8_to_pchar (const gchar *string) if (!string) return NULL; - res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring); +#ifdef PILOT_LINK_0_12 + res = convert_ToPilotChar_WithCharset ("UTF-8", string, strlen (string), + &pstring, pilot_charset); +#else + res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring); +#endif if (res != 0) pstring = strdup (string); @@ -48,7 +53,7 @@ e_pilot_utf8_to_pchar (const gchar *string) } gchar * -e_pilot_utf8_from_pchar (const gchar *string) +e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset) { gchar *ustring = NULL; gint res; @@ -56,7 +61,12 @@ e_pilot_utf8_from_pchar (const gchar *string) if (!string) return NULL; - res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring); +#ifdef PILOT_LINK_0_12 + res = convert_FromPilotChar_WithCharset ("UTF-8", string, strlen (string), + &ustring, pilot_charset); +#else + res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring); +#endif if (res != 0) ustring = strdup (string); diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 6b9b0ad884..9def45a8d8 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -29,8 +29,8 @@ #ifndef E_PILOT_UTIL_H #define E_PILOT_UTIL_H -gchar *e_pilot_utf8_to_pchar (const gchar *string); -gchar *e_pilot_utf8_from_pchar (const gchar *string); +gchar *e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset); +gchar *e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset); ESource *e_pilot_get_sync_source (ESourceList *source_list); void e_pilot_set_sync_source (ESourceList *source_list, ESource *source); |