From fff1110610062f03b1cc7ffee1c3e076cfe61bdd Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 19 Dec 2000 23:09:31 +0000 Subject: Convert cal component strings to pilot character set 2000-12-19 JP Rosevear * conduits/calendar/calendar-conduit.c (local_record_from_comp): Convert cal component strings to pilot character set (comp_from_remote_record): vice versa * conduits/todo/todo-conduit.c: Same as above 2000-12-19 JP Rosevear * conduit/address-conduit.c (local_record_from_ecard): Convert ecard strings to pilot encodings 2000-12-19 JP Rosevear * e-pilot-util.c (e_pilot_utf8_to_pchar): Convert utf8 strings to pilot character set (e_pilot_utf8_from_pchar): vice versa * Makefile.am: Conditionally build e-pilot-util.[hc] because they depend on pilot-link stuff svn path=/trunk/; revision=7090 --- e-util/ChangeLog | 9 +++++++++ e-util/Makefile.am | 13 +++++++++--- e-util/e-pilot-util.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ e-util/e-pilot-util.h | 29 ++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 e-util/e-pilot-util.c create mode 100644 e-util/e-pilot-util.h (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index fa3d554f78..acfa209e41 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,12 @@ +2000-12-19 JP Rosevear + + * e-pilot-util.c (e_pilot_utf8_to_pchar): Convert utf8 strings to + pilot character set + (e_pilot_utf8_from_pchar): vice versa + + * Makefile.am: Conditionally build e-pilot-util.[hc] because + they depend on pilot-link stuff + 2000-12-13 Larry Ewing * e-html-utils.c (e_text_to_html): make sure we actually make diff --git a/e-util/Makefile.am b/e-util/Makefile.am index e01b827ede..eb42fef5e0 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -7,9 +7,9 @@ INCLUDES = \ $(GNOME_INCLUDEDIR) \ $(EXTRA_GNOME_CFLAGS) \ $(UNICODE_CFLAGS) \ + $(PISOCK_INCLUDEDIR) \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ - -DG_LOG_DOMAIN=\"e-utils\" \ - $(UNICODE_CFLAGS) + -DG_LOG_DOMAIN=\"e-utils\" noinst_LTLIBRARIES = libeutil.la libeutil-static.la \ libeconduit.la libeconduit-static.la @@ -45,9 +45,16 @@ libeutil_la_LIBADD = $(UNICODE_LIBS) libeutil_static_la_SOURCES = $(libeutil_la_SOURCES) libeutil_static_la_LDFLAGS = --all-static +if ENABLE_PILOT_CONDUITS +pl_needed = e-pilot-util.c e-pilot-util.h +else +pl_needed = +endif + libeconduit_la_SOURCES = \ e-pilot-map.c \ - e-pilot-map.h + e-pilot-map.h \ + $(pl_needed) libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES) libeconduit_static_la_LDFLAGS = --all-static diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c new file mode 100644 index 0000000000..93bf9aa1b2 --- /dev/null +++ b/e-util/e-pilot-util.c @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* Evolution Conduits - Pilot Map routines + * + * Copyright (C) 2000 Helix Code, Inc. + * + * Authors: JP Rosevear + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include +#include +#include +#include +#include + +char * +e_pilot_utf8_to_pchar (const char *string) +{ + char *pstring = NULL; + int res; + + res = convert_ToPilotChar ("UTF8", string, strlen (string), &pstring); + + if (res != 0) + pstring = strdup (string); + + return pstring; +} + +char * +e_pilot_utf8_from_pchar (const char *string) +{ + char *ustring = NULL; + int res; + + res = convert_FromPilotChar ("UTF8", string, strlen (string), &ustring); + + if (res != 0) + ustring = strdup (ustring); + + return ustring; +} diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h new file mode 100644 index 0000000000..076bd1102e --- /dev/null +++ b/e-util/e-pilot-util.h @@ -0,0 +1,29 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* Evolution Conduits - Pilot Map routines + * + * Copyright (C) 2000 Helix Code, Inc. + * + * Authors: JP Rosevear + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef E_PILOT_UTIL_H +#define E_PILOT_UTIL_H + +char *e_pilot_utf8_to_pchar (const char *string); +char *e_pilot_utf8_from_pchar (const char *string); + +#endif /* E_PILOT_UTIL_H */ -- cgit v1.2.3