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 /calendar/conduits/common | |
parent | e3561c50baeaf9d7f24892c3e72cd46eab91d111 (diff) | |
download | gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.gz gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.bz2 gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.lz gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.xz gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.tar.zst gsoc2013-evolution-9cd8dede8bd6eac41f7486d95336909051d9b4c2.zip |
Fixed bug 364618, solve the chinese character issue.
Diffstat (limited to 'calendar/conduits/common')
-rw-r--r-- | calendar/conduits/common/libecalendar-common-conduit.c | 8 | ||||
-rw-r--r-- | calendar/conduits/common/libecalendar-common-conduit.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index eee54e71fc..5a082461c6 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -126,7 +126,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate /* *conversion from an evolution category to a palm category */ -void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category) +void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset) { GSList *c_list = NULL; gchar * category_string; @@ -134,7 +134,7 @@ void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, e_cal_component_get_categories_list (comp, &c_list); if (c_list) { /* list != 0, so at least 1 category is assigned */ - category_string = e_pilot_utf8_to_pchar((const gchar *)c_list->data); + category_string = e_pilot_utf8_to_pchar((const gchar *)c_list->data, pilot_charset); if (c_list->next != 0) { LOG (g_message ("Note: item has more categories in evolution, first chosen")); } @@ -162,13 +162,13 @@ void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, /* *conversion from a palm category to an evolution category */ -void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category) +void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset) { gchar *category_string = NULL; if (pilotCategory != 0) { /* pda has category assigned */ - category_string = e_pilot_utf8_from_pchar(category->name[pilotCategory]); + category_string = e_pilot_utf8_from_pchar(category->name[pilotCategory], pilot_charset); LOG(g_message("Category: %s\n", category_string)); diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h index 2eeb8b2723..071403ac58 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.h +++ b/calendar/conduits/common/libecalendar-common-conduit.h @@ -25,8 +25,8 @@ #define PILOT_MAX_CATEGORIES 16 gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category); -void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); -void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); +void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset); +void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset); gboolean e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def); void e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value); |