aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/Makefile.am54
-rw-r--r--e-util/e-pilot-map.c418
-rw-r--r--e-util/e-pilot-map.h60
-rw-r--r--e-util/e-pilot-util.c119
-rw-r--r--e-util/e-pilot-util.h38
5 files changed, 1 insertions, 688 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 7df0e0d49e..f1c6131965 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,5 +1,4 @@
eutilincludedir = $(privincludedir)/e-util
-econdincludedir = $(privincludedir)/e-conduit
ecpsdir = $(privdatadir)/ecps
ruledir = $(privdatadir)
@@ -7,7 +6,7 @@ if OS_WIN32
PLATFORM_SOURCES = e-win32-reloc.c e-win32-defaults.c e-win32-defaults.h
endif
-privsolib_LTLIBRARIES = libeutil.la libeconduit.la
+privsolib_LTLIBRARIES = libeutil.la
eutilinclude_HEADERS = \
e-account-utils.h \
@@ -85,7 +84,6 @@ libeutil_la_CPPFLAGS = \
-DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PLATFORM_CFLAGS) \
- $(GNOME_PILOT_CFLAGS) \
$(E_UTIL_CFLAGS)
libeutil_la_SOURCES = \
@@ -148,65 +146,15 @@ libeutil_la_LDFLAGS = $(NO_UNDEFINED)
libeutil_la_LIBADD = \
$(ICONV_LIBS) \
$(E_UTIL_LIBS) \
- $(GNOME_PILOT_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(INTLLIBS)
-econdinclude_HEADERS = \
- e-pilot-map.h \
- e-pilot-util.h
-
-pilot_sources = \
- $(econdinclude_HEADERS) \
- e-pilot-map.c \
- e-pilot-util.c
-
-if ENABLE_PILOT_CONDUITS
-pilot_compile = $(pilot_sources)
-else
-pilot_compile = e-html-utils.c
-endif
-
-libeconduit_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/widgets \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
- -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
- -DEVOLUTION_LIBDIR=\""$(datadir)"\" \
- -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \
- -DEVOLUTION_PREFIX=\""$(prefix)"\" \
- -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
- -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \
- -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \
- -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
- -DEVOLUTION_UIDIR=\""$(uidir)"\" \
- -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
- -DG_LOG_DOMAIN=\"e-utils\" \
- $(GNOME_PILOT_CFLAGS) \
- $(E_UTIL_CFLAGS)
-
-libeconduit_la_SOURCES = $(pilot_compile)
-
-libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
-
-libeconduit_la_LIBADD = $(E_UTIL_LIBS) $(GNOME_PILOT_LIBS)
-
error_DATA = e-system.error
errordir = $(privdatadir)/errors
@EVO_PLUGIN_RULE@
EXTRA_DIST = \
e-system.error.xml \
- $(pilot_sources) \
e-marshal.list
BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA)
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
deleted file mode 100644
index 2c047d60f6..0000000000
--- a/e-util/e-pilot-map.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Evolution Conduits - Pilot Map routines
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * JP Rosevear <jpr@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <libxml/parser.h>
-
-#include <libedataserver/e-xml-utils.h>
-
-#include "e-pilot-map.h"
-
-typedef struct
-{
- gchar *uid;
- gboolean archived;
- gboolean touched;
-} EPilotMapPidNode;
-
-typedef struct
-{
- guint32 pid;
- gboolean archived;
- gboolean touched;
-} EPilotMapUidNode;
-
-typedef struct
-{
- gboolean touched_only;
- xmlNodePtr root;
-} EPilotMapWriteData;
-
-static void
-real_e_pilot_map_insert (EPilotMap *map,
- guint32 pid,
- const gchar *uid,
- gboolean archived,
- gboolean touch)
-{
- gchar *new_uid;
- guint32 *new_pid = NULL;
- EPilotMapPidNode *pnode = NULL;
- EPilotMapUidNode *unode;
-
- g_return_if_fail (map != NULL);
- g_return_if_fail (uid != NULL);
-
- /* Keys */
- if (pid != 0) {
- new_pid = g_new (guint32, 1);
- *new_pid = pid;
- }
- new_uid = g_strdup (uid);
-
- /* Values */
- if (pid != 0) {
- pnode = g_new0 (EPilotMapPidNode, 1);
- pnode->uid = new_uid;
- pnode->archived = archived;
- if (touch)
- pnode->touched = TRUE;
- }
-
- unode = g_new0 (EPilotMapUidNode, 1);
- unode->pid = pid;
- unode->archived = archived;
- if (touch)
- unode->touched = TRUE;
-
- /* Insertion */
- if (pid != 0)
- g_hash_table_insert (map->pid_map, new_pid, pnode);
- g_hash_table_insert (map->uid_map, new_uid, unode);
-}
-
-static void
-map_set_node_timet (xmlNodePtr node, const gchar *name, time_t t)
-{
- gchar *tstring;
-
- tstring = g_strdup_printf ("%ld", t);
- xmlSetProp (node, (guchar *)name, (guchar *)tstring);
- g_free (tstring);
-}
-
-static void
-map_sax_start_element (gpointer data, const xmlChar *name,
- const xmlChar **attrs)
-{
- EPilotMap *map = (EPilotMap *)data;
-
- if (!strcmp ((gchar *)name, "PilotMap")) {
- while (attrs && *attrs != NULL) {
- const xmlChar **val = attrs;
-
- val++;
- if (!strcmp ((gchar *)*attrs, "timestamp"))
- map->since = (time_t)strtoul ((gchar *)*val, NULL, 0);
-
- attrs = ++val;
- }
- }
-
- if (!strcmp ((gchar *)name, "map")) {
- const gchar *uid = NULL;
- guint32 pid = 0;
- gboolean archived = FALSE;
-
- while (attrs && *attrs != NULL) {
- const xmlChar **val = attrs;
-
- val++;
- if (!strcmp ((gchar *)*attrs, "uid"))
- uid = (gchar *)*val;
-
- if (!strcmp ((gchar *)*attrs, "pilot_id"))
- pid = strtoul ((gchar *)*val, NULL, 0);
-
- if (!strcmp ((gchar *)*attrs, "archived"))
- archived = strtoul ((gchar *)*val, NULL, 0)== 1 ? TRUE : FALSE;
-
- attrs = ++val;
- }
-
- g_return_if_fail (uid != NULL);
- g_return_if_fail (pid != 0 || archived);
-
- real_e_pilot_map_insert (map, pid, uid, archived, FALSE);
- }
-}
-
-static void
-map_write_foreach (gpointer key, gpointer value, gpointer data)
-{
- EPilotMapWriteData *wd = data;
- xmlNodePtr root = wd->root;
- gchar *uid = key;
- EPilotMapUidNode *unode = value;
- xmlNodePtr mnode;
-
- if (wd->touched_only && !unode->touched)
- return;
-
- mnode = xmlNewChild (root, NULL, (const guchar *)"map", NULL);
- xmlSetProp (mnode, (const guchar *)"uid", (guchar *)uid);
-
- if (unode->archived) {
- xmlSetProp (mnode, (const guchar *)"archived", (const guchar *)"1");
- } else {
- gchar *pidstr;
-
- pidstr = g_strdup_printf ("%d", unode->pid);
- xmlSetProp (mnode, (const guchar *)"pilot_id", (guchar *)pidstr);
- g_free (pidstr);
- xmlSetProp (mnode, (const guchar *)"archived", (const guchar *)"0");
- }
-}
-
-gboolean
-e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid)
-{
- EPilotMapPidNode *pnode;
-
- g_return_val_if_fail (map != NULL, FALSE);
-
- pnode = g_hash_table_lookup (map->pid_map, &pid);
-
- if (pnode == NULL)
- return FALSE;
-
- return pnode->archived;
-}
-
-gboolean
-e_pilot_map_uid_is_archived (EPilotMap *map, const gchar *uid)
-{
- EPilotMapUidNode *unode;
-
- g_return_val_if_fail (map != NULL, FALSE);
- g_return_val_if_fail (uid != NULL, FALSE);
-
- unode = g_hash_table_lookup (map->uid_map, uid);
-
- if (unode == NULL)
- return FALSE;
-
- return unode->archived;
-}
-
-void
-e_pilot_map_insert (EPilotMap *map, guint32 pid, const gchar *uid, gboolean archived)
-{
- EPilotMapPidNode *pnode;
- EPilotMapUidNode *unode;
-
- pnode = g_hash_table_lookup (map->pid_map, &pid);
- if (pnode != NULL) {
- /* In case the pid<->uid mapping is not the same anymore */
- g_hash_table_remove (map->uid_map, pnode->uid);
-
- g_hash_table_remove (map->pid_map, &pid);
- }
-
- unode = g_hash_table_lookup (map->uid_map, uid);
- if (unode != NULL) {
- /* In case the pid<->uid mapping is not the same anymore */
- g_hash_table_remove (map->pid_map, &unode->pid);
-
- g_hash_table_remove (map->uid_map, uid);
- }
-
- real_e_pilot_map_insert (map, pid, uid, archived, TRUE);
-}
-
-void
-e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid)
-{
- EPilotMapPidNode *pnode;
- EPilotMapUidNode *unode;
-
- g_return_if_fail (map != NULL);
-
- pnode = g_hash_table_lookup (map->pid_map, &pid);
- if (pnode == NULL)
- return;
-
- unode = g_hash_table_lookup (map->uid_map, pnode->uid);
- g_return_if_fail (unode != NULL);
-
- g_hash_table_remove (map->uid_map, pnode->uid);
- g_hash_table_remove (map->pid_map, &pid);
-}
-
-void
-e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid)
-{
- EPilotMapUidNode *unode;
-
- g_return_if_fail (map != NULL);
- g_return_if_fail (uid != NULL);
-
- unode = g_hash_table_lookup (map->uid_map, uid);
- if (unode == NULL)
- return;
-
- g_hash_table_remove (map->pid_map, &unode->pid);
- g_hash_table_remove (map->uid_map, uid);
-}
-
-guint32
-e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch)
-{
- EPilotMapUidNode *unode = NULL;
-
- g_return_val_if_fail (map != NULL, 0);
- g_return_val_if_fail (uid != NULL, 0);
-
- unode = g_hash_table_lookup (map->uid_map, uid);
-
- if (unode == NULL)
- return 0;
-
- if (touch) {
- EPilotMapPidNode *pnode = NULL;
-
- pnode = g_hash_table_lookup (map->pid_map, &unode->pid);
- if (pnode != NULL)
- pnode->touched = TRUE;
- unode->touched = TRUE;
- }
-
- return unode->pid;
-}
-
-const gchar *
-e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch)
-{
- EPilotMapPidNode *pnode = NULL;
-
- g_return_val_if_fail (map != NULL, NULL);
-
- pnode = g_hash_table_lookup (map->pid_map, &pid);
-
- if (pnode == NULL)
- return NULL;
-
- if (touch) {
- EPilotMapUidNode *unode = NULL;
-
- unode = g_hash_table_lookup (map->uid_map, pnode->uid);
- g_return_val_if_fail (unode != NULL, NULL);
-
- unode->touched = TRUE;
- pnode->touched = TRUE;
- }
-
- return pnode->uid;
-}
-
-gint
-e_pilot_map_read (const gchar *filename, EPilotMap **map)
-{
- xmlSAXHandler handler;
- EPilotMap *new_map;
-
- g_return_val_if_fail (filename != NULL, -1);
- g_return_val_if_fail (map != NULL, -1);
-
- *map = NULL;
- new_map = g_new0 (EPilotMap, 1);
-
- memset (&handler, 0, sizeof (xmlSAXHandler));
- handler.startElement = map_sax_start_element;
-
- new_map->pid_map = g_hash_table_new_full (
- g_int_hash, g_int_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
- new_map->uid_map = g_hash_table_new_full (
- g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
-
- if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
- if (xmlSAXUserParseFile (&handler, new_map, filename) < 0) {
- g_free (new_map);
- return -1;
- }
- }
-
- new_map->write_touched_only = FALSE;
-
- *map = new_map;
-
- return 0;
-}
-
-gint
-e_pilot_map_write (const gchar *filename, EPilotMap *map)
-{
- EPilotMapWriteData wd;
- xmlDocPtr doc;
- gint ret;
-
- g_return_val_if_fail (filename != NULL, -1);
- g_return_val_if_fail (map != NULL, -1);
-
- doc = xmlNewDoc ((const guchar *)"1.0");
- if (doc == NULL) {
- g_warning ("Pilot map file could not be created\n");
- return -1;
- }
- xmlDocSetRootElement (
- doc, xmlNewDocNode (
- doc, NULL, (const guchar *)"PilotMap", NULL));
- map->since = time (NULL);
- map_set_node_timet (xmlDocGetRootElement (doc), "timestamp", map->since);
-
- wd.touched_only = map->write_touched_only;
- wd.root = xmlDocGetRootElement(doc);
- g_hash_table_foreach (map->uid_map, map_write_foreach, &wd);
-
- /* Write the file */
- xmlSetDocCompressMode (doc, 0);
- ret = e_xml_save_file (filename, doc);
- if (ret < 0) {
- g_warning ("Pilot map file '%s' could not be saved\n", filename);
- return -1;
- }
-
- xmlFreeDoc (doc);
-
- return 0;
-}
-
-void
-e_pilot_map_clear (EPilotMap *map)
-{
- g_return_if_fail (map != NULL);
-
- g_hash_table_remove_all (map->pid_map);
- g_hash_table_remove_all (map->uid_map);
-
- map->since = 0;
- map->write_touched_only = FALSE;
-}
-
-void
-e_pilot_map_destroy (EPilotMap *map)
-{
- g_return_if_fail (map != NULL);
-
- g_hash_table_destroy (map->pid_map);
- g_hash_table_destroy (map->uid_map);
- g_free (map);
-}
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
deleted file mode 100644
index 32bcc942bf..0000000000
--- a/e-util/e-pilot-map.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Evolution Conduits - Pilot Map routines
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * JP Rosevear <jpr@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_PILOT_MAP_H
-#define E_PILOT_MAP_H
-
-#include <glib.h>
-#include <time.h>
-
-typedef struct _EPilotMap EPilotMap;
-
-struct _EPilotMap
-{
- GHashTable *pid_map;
- GHashTable *uid_map;
-
- time_t since;
-
- gboolean write_touched_only;
-};
-
-gboolean e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid);
-gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const gchar *uid);
-
-void e_pilot_map_insert (EPilotMap *map, guint32 pid, const gchar *uid, gboolean archived);
-void e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid);
-void e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid);
-
-guint32 e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch);
-const gchar * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch);
-
-gint e_pilot_map_read (const gchar *filename, EPilotMap **map);
-gint e_pilot_map_write (const gchar *filename, EPilotMap *map);
-
-void e_pilot_map_clear (EPilotMap *map);
-
-void e_pilot_map_destroy (EPilotMap *map);
-
-#endif /* E_PILOT_MAP_H */
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
deleted file mode 100644
index 3d8d2cddfb..0000000000
--- a/e-util/e-pilot-util.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Evolution Conduits - Pilot Map routines
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * JP Rosevear <jpr@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <libxml/parser.h>
-#include <pi-util.h>
-
-#include "e-pilot-util.h"
-
-gchar *
-e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset)
-{
- gchar *pstring = NULL;
- gint res;
-
- if (!string)
- return NULL;
-
-#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);
-
- return pstring;
-}
-
-gchar *
-e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset)
-{
- gchar *ustring = NULL;
- gint res;
-
- if (!string)
- return NULL;
-
-#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);
-
- return ustring;
-}
-
-ESource *
-e_pilot_get_sync_source (ESourceList *source_list)
-{
- GSList *g;
-
- g_return_val_if_fail (source_list != NULL, NULL);
- g_return_val_if_fail (E_IS_SOURCE_LIST (source_list), NULL);
-
- for (g = e_source_list_peek_groups (source_list); g; g = g->next) {
- ESourceGroup *group = E_SOURCE_GROUP (g->data);
- GSList *s;
-
- for (s = e_source_group_peek_sources (group); s; s = s->next) {
- ESource *source = E_SOURCE (s->data);
-
- if (e_source_get_property (source, "pilot-sync"))
- return source;
- }
- }
-
- return NULL;
-}
-
-void
-e_pilot_set_sync_source (ESourceList *source_list, ESource *source)
-{
- GSList *g;
-
- g_return_if_fail (source_list != NULL);
- g_return_if_fail (E_IS_SOURCE_LIST (source_list));
-
- for (g = e_source_list_peek_groups (source_list); g; g = g->next) {
- GSList *s;
- for (s = e_source_group_peek_sources (E_SOURCE_GROUP (g->data));
- s; s = s->next) {
- e_source_set_property (E_SOURCE (s->data), "pilot-sync", NULL);
- }
- }
-
- if (source)
- e_source_set_property (source, "pilot-sync", "true");
- e_source_list_sync (source_list, NULL);
-}
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
deleted file mode 100644
index 9def45a8d8..0000000000
--- a/e-util/e-pilot-util.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- *Evolution Conduits - Pilot Map routines
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * JP Rosevear <jpr@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <libedataserver/e-source-list.h>
-#include <libedataserver/e-source.h>
-
-#ifndef E_PILOT_UTIL_H
-#define E_PILOT_UTIL_H
-
-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);
-
-#endif /* E_PILOT_UTIL_H */