evolution-data-server r8393 - branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi



Author: msuman
Date: Fri Jan 18 10:44:44 2008
New Revision: 8393
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8393&view=rev

Log:
Updated timezone mappings. Dump sufficient info on terminal for better debugging. Code cleanup. 

Modified:
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-tz-utils.c
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-utils.c
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-ical-to-mapi
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-mapi-to-ical

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am	Fri Jan 18 10:44:44 2008
@@ -43,6 +43,3 @@
 
 EXTRA_DIST = 	\
 	$(mapidata_DATA)
-
-DISTCLEANFILES = 	\
-	$(mapidata_DATA)

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-tz-utils.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-tz-utils.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-tz-utils.c	Fri Jan 18 10:44:44 2008
@@ -23,6 +23,8 @@
 #include "e-cal-backend-mapi.h"
 #include "e-cal-backend-mapi-tz-utils.h"
 
+#define d(x) 
+
 #define MAPPING_SEPARATOR "~~~"
 
 static GStaticRecMutex mutex = G_STATIC_REC_MUTEX_INIT;
@@ -44,6 +46,8 @@
 		return NULL;
 	}
 
+	d(g_message("%s(%d): %s of '%s' ", __FILE__, __LINE__, __PRETTY_FUNCTION__, ical_tzid));
+
 	if (lru_ical_id && !g_ascii_strcasecmp (ical_tzid, lru_ical_id)) {
 		g_static_rec_mutex_unlock(&mutex);
 		return lru_mapi_id;
@@ -69,6 +73,8 @@
 		return NULL;
 	}
 
+	d(g_message("%s(%d): %s of '%s' ", __FILE__, __LINE__, __PRETTY_FUNCTION__, mapi_tzid));
+
 	if (lru_mapi_id && !g_ascii_strcasecmp (mapi_tzid, lru_mapi_id)) {
 		g_static_rec_mutex_unlock(&mutex);
 		return lru_ical_id;
@@ -146,7 +152,7 @@
 	g_free (itom_fn);
 
 	if (!(mtoi_mf && itom_mf)) {
-		g_warning ("Could not map Exchange MAPI timezone files\n");
+		g_warning ("Could not map Exchange MAPI timezone files.");
 
 		if (mtoi_mf)
 			g_mapped_file_free (mtoi_mf);
@@ -172,7 +178,7 @@
 	file_contents_to_hashtable (g_mapped_file_get_contents (itom_mf), ical_to_mapi);
 
 	if (!(g_hash_table_size (mapi_to_ical) && g_hash_table_size (ical_to_mapi))) {
-		g_warning ("Exchange MAPI timezone files are not valid\n");
+		g_warning ("Exchange MAPI timezone files are not valid.");
 
 		e_cal_backend_mapi_tz_util_destroy ();
 
@@ -200,7 +206,7 @@
 	/* Get the array of builtin timezones. */
 	zones = icaltimezone_get_builtin_timezones ();
 
-	g_print("\n%s(%d): %s: \n", __FILE__, __LINE__, __PRETTY_FUNCTION__);
+	g_message("%s(%d): %s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__);
 	for (i = 0; i < zones->num_elements; i++) {
 		icaltimezone *zone;
 		char *tzid = NULL;
@@ -240,25 +246,31 @@
 		return;
 	}
 
-	g_print("\n%s(%d): %s: \n", __FILE__, __LINE__, __PRETTY_FUNCTION__);
+	g_message("%s(%d): %s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__);
 
-	g_print ("\nDumping #table mapi_to_ical\n");
+	g_message ("Dumping #table mapi_to_ical");
 	keys = g_hash_table_get_keys (mapi_to_ical);
 	values = g_hash_table_get_values (mapi_to_ical);
 	l = g_list_first (keys);
 	m = g_list_first (values);
 	for (i=0; l && m; ++i, l=l->next, m=m->next)
-		g_print ("[%3d]\t%s\t~~~\t%s\n", (i+1), (gchar *)(l->data), (gchar *)(m->data));
+		g_print ("[%3d]\t%s\t%s\t%s\n", (i+1), (gchar *)(l->data), MAPPING_SEPARATOR, (gchar *)(m->data));
+	g_message ("Dumping differences in #tables");
+	l = g_list_first (keys);
+	m = g_list_first (values);
+	for (i=0; l && m; ++i, l=l->next, m=m->next)
+		if (g_ascii_strcasecmp ((gchar *)(l->data), (gchar *) g_hash_table_lookup (ical_to_mapi, (m->data))))
+			g_print ("[%3d] Possible mis-match for %s\n", (i+1), (gchar *)(l->data));
 	g_list_free (keys);
 	g_list_free (values);
 
-	g_print ("\nDumping #table ical_to_mapi\n");
+	g_message ("Dumping #table ical_to_mapi");
 	keys = g_hash_table_get_keys (ical_to_mapi);
 	values = g_hash_table_get_values (ical_to_mapi);
 	l = g_list_first (keys);
 	m = g_list_first (values);
 	for (i=0; l && m; ++i, l=l->next, m=m->next)
-		g_print ("[%3d]\t%s\t~~~\t%s\n", (i+1), (gchar *)(l->data), (gchar *)(m->data));
+		g_print ("[%3d]\t%s\t%s\t%s\n", (i+1), (gchar *)(l->data), MAPPING_SEPARATOR, (gchar *)(m->data));
 	g_list_free (keys);
 	g_list_free (values);
 
@@ -269,12 +281,6 @@
 const WORD TZRULE_FLAG_RECUR_CURRENT_TZREG  = 0x0001; // see dispidApptTZDefRecur
 const WORD TZRULE_FLAG_EFFECTIVE_TZREG      = 0x0002;
 
-#define TZDEFINITION_FLAG_VALID_GUID     0x0001 // the guid is valid
-#define TZDEFINITION_FLAG_VALID_KEYNAME  0x0002 // the keyname is valid
-#define TZ_MAX_RULES          1024 
-#define TZ_BIN_VERSION_MAJOR  0x02 
-#define TZ_BIN_VERSION_MINOR  0x01 
-
 // Allocates return value with new.
 // clean up with delete[].
 TZDEFINITION* BinToTZDEFINITION(ULONG cbDef, LPBYTE lpbDef)
@@ -447,28 +453,35 @@
 	guint16 flag16;
 	gunichar2 *buf;
 	glong items_written;
+	guint32 i;
 
 	ba = g_byte_array_new ();
 
+	/* UTF-8 length of the keyname */
 	flag16 = g_utf8_strlen (mapi_tzid, -1);
 	ba = g_byte_array_append (ba, &flag16, sizeof (guint16));
+	/* Keyname */
 	buf = g_utf8_to_utf16 (mapi_tzid, flag16, NULL, &items_written, NULL);
 	ba = g_byte_array_append (ba, buf, (sizeof (gunichar2) * items_written));
 	g_free (buf);
 
-	/* FIXME: Need to support rules */
+	/* number of rules *//* FIXME: Need to support rules */
 	flag16 = 0x0000;
 	ba = g_byte_array_append (ba, &flag16, sizeof (guint16));
 
+	/* wFlags: we know only keyname based names */
 	flag16 = TZDEFINITION_FLAG_VALID_KEYNAME;
 	ba = g_byte_array_prepend (ba, &flag16, sizeof (guint16));
 
+	/* Length in bytes until rules info */
 	flag16 = (guint16) (ba->len);
 	ba = g_byte_array_prepend (ba, &flag16, sizeof (guint16));
 
+	/* Minor version */
 	flag8 = TZ_BIN_VERSION_MINOR;
 	ba = g_byte_array_prepend (ba, &flag8, sizeof (guint8));
 
+	/* Major version */
 	flag8 = TZ_BIN_VERSION_MAJOR;
 	ba = g_byte_array_prepend (ba, &flag8, sizeof (guint8));
 
@@ -477,6 +490,10 @@
 	sb->lpb = ba->data;
 	sb->cb = ba->len;
 
+	d(g_message ("New timezone stream.. Length: %d bytes.. Hex-data follows:", ba->len));
+	d(for (i = 0; i < ba->len; i++) 
+		g_print("0x%.2X ", ba->data[i]));
+
 	g_byte_array_free (ba, FALSE);
 }
 
@@ -489,32 +506,32 @@
 //	guint len = ba->len;
 	gchar *buf = NULL;
 
-	g_print ("\n\n++ New timezone info:\n");
+	d(g_message ("New timezone stream.. Length: %d bytes.. Info follows:", ba->len));
 
 	/* Major version */
 	flag8 = *((guint8 *)ptr);
 	ptr += sizeof (guint8);
-	g_print ("Major version: %d\n", flag8);
+	d(g_print ("Major version: %d\n", flag8));
 	if (TZ_BIN_VERSION_MAJOR != flag8)
 		return NULL;
 
 	/* Minor version */
 	flag8 = *((guint8 *)ptr);
 	ptr += sizeof (guint8);
-	g_print ("Minor version: %d\n", flag8);
+	d(g_print ("Minor version: %d\n", flag8));
 	if (TZ_BIN_VERSION_MINOR > flag8)
 		return NULL;
 
-	/* Length in bytes until rules */
+	/* Length in bytes until rules info */
 	flag16 = *((guint16 *)ptr);
 	ptr += sizeof (guint16);
-	g_print ("Length in bytes until rules: %d\n", flag16);
+	d(g_print ("Length in bytes until rules: %d\n", flag16));
 	cbHeader = flag16;
 
 	/* wFlags: we don't yet understand GUID based names */
 	flag16 = *((guint16 *)ptr);
 	ptr += sizeof (guint16);
-	g_print ("wFlags: %d\n", flag16);
+	d(g_print ("wFlags: %d\n", flag16));
 	cbHeader -= sizeof (guint16);
 	if (TZDEFINITION_FLAG_VALID_KEYNAME != flag16)
 		return NULL;
@@ -522,24 +539,23 @@
 	/* UTF-8 length of the keyname */
 	flag16 = *((guint16 *)ptr);
 	ptr += sizeof (guint16);
-	g_print ("UTF8 length of keyname: %d\n", flag16);
+	d(g_print ("UTF8 length of keyname: %d\n", flag16));
 	cbHeader -= sizeof (guint16);
 
 	/* number of rules is at the end of the header.. we'll parse and use later */
 	cbHeader -= sizeof (guint16);
 
+	/* Keyname */
 	buf = g_utf16_to_utf8 ((const gunichar2 *)ptr, cbHeader/sizeof (gunichar2), NULL, NULL, NULL);
 	ptr += cbHeader;
-	g_print ("Keyname: %s\n", buf);
+	d(g_print ("Keyname: %s\n", buf));
 
 	/* number of rules */
 	flag16 = *((guint16 *)ptr);
 	ptr += sizeof (guint16);
-	g_print ("Number of rules: %d\n", flag16);
+	d(g_print ("Number of rules: %d\n", flag16));
 
 	/* FIXME: Need to support rules */
 
-	g_print ("++ End timezone info\n\n");
-
 	return buf;
 }

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-utils.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-utils.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi-utils.c	Fri Jan 18 10:44:44 2008
@@ -28,6 +28,10 @@
 #define O_BINARY 0
 #endif
 
+#include <glib/gstdio.h>
+
+#include <fcntl.h>
+
 #include "e-cal-backend-mapi.h"
 #include "e-cal-backend-mapi-utils.h"
 #include "e-cal-backend-mapi-tz-utils.h"
@@ -116,7 +120,7 @@
 	char *dest_file;
 	int fd;
 	const char *uid;
-	const char *local_store = e_cal_backend_mapi_get_local_attachments_store (E_CAL_BACKEND (cbmapi));
+	const char *local_store = e_cal_backend_mapi_get_local_attachments_store (cbmapi);
 
 	e_cal_component_get_attachment_list (comp, &comp_attach_list);
 	e_cal_component_get_uid (comp, &uid);
@@ -176,7 +180,7 @@
 {
 	GSList *comp_attach_list = NULL, *l;
 	const char *uid;
-	const char *local_store = e_cal_backend_mapi_get_local_attachments_store (E_CAL_BACKEND (cbmapi));
+	const char *local_store = e_cal_backend_mapi_get_local_attachments_store (cbmapi);
 	
 	e_cal_component_get_uid (comp, &uid);
 	for (l = attach_list; l ; l = l->next) {

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.c	Fri Jan 18 10:44:44 2008
@@ -27,6 +27,8 @@
 
 #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
 
+#define d(x)
+
 static ECalBackendClass *parent_class = NULL;
 
 /* Private part of the CalBackendMAPI structure */
@@ -63,6 +65,8 @@
 
 #define CACHE_REFRESH_INTERVAL 600000
 
+static gboolean authenticated = FALSE;
+static GStaticMutex auth_mutex = G_STATIC_MUTEX_INIT;
 
 static ECalBackendSyncStatus
 e_cal_backend_mapi_authenticate (ECalBackend *backend)
@@ -73,15 +77,19 @@
 	cbmapi = E_CAL_BACKEND_MAPI (backend);
 	priv = cbmapi->priv;
 
-	if (exchange_mapi_connection_exists () || exchange_mapi_connection_new (priv->user_email, NULL))
+	g_static_mutex_lock (&auth_mutex);
+	if (authenticated || exchange_mapi_connection_exists () || exchange_mapi_connection_new (priv->user_email, NULL)) {
+		authenticated = TRUE;
+		g_static_mutex_unlock (&auth_mutex);
 		return GNOME_Evolution_Calendar_Success;
-	else { 
+	} else { 
+		authenticated = FALSE;
 		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Authentication failed"));
+		g_static_mutex_unlock (&auth_mutex);
 		return GNOME_Evolution_Calendar_AuthenticationFailed;
 	}
 }
 
-
 /***** OBJECT CLASS FUNCTIONS *****/
 static void 
 e_cal_backend_mapi_dispose (GObject *object)
@@ -258,24 +266,18 @@
 {
 	ECalBackendMAPI *cbmapi;
 	ECalBackendMAPIPrivate *priv;
-	gboolean authenticated = FALSE, status = FALSE;
+	gboolean status = FALSE;
 
 	cbmapi = E_CAL_BACKEND_MAPI (backend);
 	priv = cbmapi->priv;
 
 	if (priv->mode == CAL_MODE_LOCAL)
 		return GNOME_Evolution_Calendar_RepositoryOffline;
-#if 0
-	if (exchange_mapi_connection_exists ())
-		authenticated = TRUE;
-	else if (exchange_mapi_connection_new (priv->user_email, NULL)) 
-		authenticated = TRUE;
-	else { 
-		authenticated = FALSE;
-		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Authentication failed"));
-		return GNOME_Evolution_Calendar_AuthenticationFailed;
-	}
-#endif
+
+	/* FIXME: check for return status and respond */
+	if (!authenticated)
+		e_cal_backend_mapi_authenticate (E_CAL_BACKEND (cbmapi));
+
 	status = exchange_mapi_remove_folder (priv->olFolder, priv->fid);
 	if (!status)
 		return GNOME_Evolution_Calendar_OtherError;
@@ -369,7 +371,7 @@
 
 			cache_comp = e_cal_backend_cache_get_component (priv->cache, (const char *) cache_comp_uid->data, NULL);
 			e_cal_component_get_last_modified (cache_comp, &cache_comp_lm);
-			if (icaltime_compare (itt, *cache_comp_lm) != 0) {
+			if (!cache_comp_lm || icaltime_compare (itt, *cache_comp_lm) != 0) {
 				ECalComponent *comp;
 				char *old_comp_str = NULL, *new_comp_str = NULL;
 
@@ -390,6 +392,7 @@
 				g_free (new_comp_str);
 			}
 			g_object_unref (cache_comp);
+			g_free (cache_comp_lm);
 		}
 		priv->cache_keys = g_slist_remove_link (priv->cache_keys, cache_comp_uid);
 	}
@@ -974,22 +977,15 @@
 	ECalSourceType source_type;
 	GThread *thread;
 	GError *error = NULL;
-	gboolean authenticated = TRUE;
 
 	priv = cbmapi->priv;
 
 	source = e_cal_backend_get_source (E_CAL_BACKEND (cbmapi));
-#if 0
-	if (exchange_mapi_connection_exists ())
-		authenticated = TRUE;
-	else if (exchange_mapi_connection_new (priv->user_email, NULL)) 
-		authenticated = TRUE;
-	else { 
-		authenticated = FALSE;
-		e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Authentication failed"));
-		return GNOME_Evolution_Calendar_AuthenticationFailed;
-	}
-#endif
+
+	/* FIXME: check status and respond */
+	if (!authenticated)
+		e_cal_backend_mapi_authenticate (E_CAL_BACKEND (cbmapi));
+
 	/* We have established a connection */
 	if (authenticated && priv->cache && priv->fid) {
 		priv->mode = CAL_MODE_REMOTE;
@@ -1051,15 +1047,6 @@
 	return GNOME_Evolution_Calendar_Success;
 }
 
-static GMutex *auth_mutex = NULL;
-static void 
-create_auth_mutex ()
-{
-	if (auth_mutex != NULL)
-		return;
-	auth_mutex = g_mutex_new ();
-}
-
 static ECalBackendSyncStatus 
 e_cal_backend_mapi_open (ECalBackendSync *backend, EDataCal *cal, gboolean only_if_exists, const char *username, const char *password)
 {
@@ -1068,7 +1055,7 @@
 	ECalBackendSyncStatus status;
 	ECalSourceType source_type;
 	ESource *esource;
-	const char *source = NULL;
+	const char *source = NULL, *fid = NULL;
 	char *filename;
 	char *mangled_uri;
 	int i;
@@ -1078,7 +1065,8 @@
 	priv = cbmapi->priv;
 
 	esource = e_cal_backend_get_source (E_CAL_BACKEND (cbmapi));
-	if (!e_source_get_property (esource, "folder-id"))
+	fid = e_source_get_property (esource, "folder-id");
+	if (!(fid && *fid))
 		return GNOME_Evolution_Calendar_OtherError;
 
 	g_mutex_lock (priv->mutex);
@@ -1136,7 +1124,7 @@
 	priv->username = g_strdup (username);
 	priv->password = g_strdup (password);
 	priv->user_email = g_strdup (e_source_get_property (esource, "profile"));
-	exchange_mapi_util_mapi_id_from_string (e_source_get_property (esource, "folder-id"), &priv->fid);
+	exchange_mapi_util_mapi_id_from_string (fid, &priv->fid);
 	priv->olFolder = olFolder;
 
 	/* Set the local attachment store*/
@@ -1153,6 +1141,7 @@
 	filename = g_build_filename (g_get_home_dir (),
 				     ".evolution/cache/", source,
 				     mangled_uri,
+				     G_DIR_SEPARATOR_S, 
 				     NULL);
 
 	g_free (mangled_uri);
@@ -1160,7 +1149,7 @@
 		g_filename_to_uri (filename, NULL, NULL);
 	g_free (filename);
 
-	status = e_cal_backend_mapi_authenticate (backend);
+	status = e_cal_backend_mapi_authenticate (E_CAL_BACKEND (cbmapi));
 	g_mutex_unlock (priv->mutex);
 
 	if (status == GNOME_Evolution_Calendar_Success)
@@ -1752,7 +1741,7 @@
 	e_cal_backend_sync_set_lock (E_CAL_BACKEND_SYNC (cbmapi), TRUE);
 
 	e_cal_backend_mapi_tz_util_populate ();
-//	e_cal_backend_mapi_tz_util_dump ();
+	d(e_cal_backend_mapi_tz_util_dump ());
 }
 
 GType
@@ -1781,12 +1770,10 @@
 
 /***** UTILITY FUNCTIONS *****/
 const char *	
-e_cal_backend_mapi_get_local_attachments_store (ECalBackend *backend)
+e_cal_backend_mapi_get_local_attachments_store (ECalBackendMAPI *cbmapi)
 {
-	ECalBackendMAPI *cbmapi;
 	ECalBackendMAPIPrivate *priv;
 
-	cbmapi = E_CAL_BACKEND_MAPI (backend);
 	priv = cbmapi->priv;
 
 	return priv->local_attachments_store;

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/e-cal-backend-mapi.h	Fri Jan 18 10:44:44 2008
@@ -29,26 +29,26 @@
 #include <libedata-cal/e-cal-backend-util.h>
 #include <libedata-cal/e-cal-backend-factory.h>
 #include <libecal/e-cal-component.h>
+#include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-xml-hash-utils.h>
+#include <libedataserver/e-url.h>
+
 #include <glib.h>
-#include <glib-object.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
+
 #include "exchange-mapi-connection.h"
 #include "exchange-mapi-folder.h"
 #include "exchange-mapi-utils.h"
 
+#if 0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <unistd.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libedataserver/e-xml-hash-utils.h>
-#include <libedataserver/e-url.h>
+#endif
 
 G_BEGIN_DECLS
 
@@ -60,7 +60,6 @@
 
 typedef struct _ECalBackendMAPI        ECalBackendMAPI;
 typedef struct _ECalBackendMAPIClass   ECalBackendMAPIClass;
-
 typedef struct _ECalBackendMAPIPrivate ECalBackendMAPIPrivate;
 
 struct _ECalBackendMAPI {
@@ -77,7 +76,7 @@
 GType	e_cal_backend_mapi_get_type(void);
 
 const char *	
-e_cal_backend_mapi_get_local_attachments_store (ECalBackend *backend);
+e_cal_backend_mapi_get_local_attachments_store (ECalBackendMAPI *cbmapi);
 
 G_END_DECLS
 

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-ical-to-mapi
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-ical-to-mapi	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-ical-to-mapi	Fri Jan 18 10:44:44 2008
@@ -1,399 +1,399 @@
 UTC~~~GMT Standard Time
-/softwarestudio.org/Tzfile/Africa/Abidjan~~~abc
-/softwarestudio.org/Tzfile/Africa/Accra~~~abc
-/softwarestudio.org/Tzfile/Africa/Addis_Ababa~~~abc
-/softwarestudio.org/Tzfile/Africa/Algiers~~~abc
-/softwarestudio.org/Tzfile/Africa/Asmara~~~abc
-/softwarestudio.org/Tzfile/Africa/Bamako~~~abc
-/softwarestudio.org/Tzfile/Africa/Bangui~~~abc
-/softwarestudio.org/Tzfile/Africa/Banjul~~~abc
-/softwarestudio.org/Tzfile/Africa/Bissau~~~abc
-/softwarestudio.org/Tzfile/Africa/Blantyre~~~abc
-/softwarestudio.org/Tzfile/Africa/Brazzaville~~~abc
-/softwarestudio.org/Tzfile/Africa/Bujumbura~~~abc
-/softwarestudio.org/Tzfile/Africa/Cairo~~~abc
-/softwarestudio.org/Tzfile/Africa/Casablanca~~~abc
-/softwarestudio.org/Tzfile/Africa/Ceuta~~~abc
-/softwarestudio.org/Tzfile/Africa/Conakry~~~abc
-/softwarestudio.org/Tzfile/Africa/Dakar~~~abc
-/softwarestudio.org/Tzfile/Africa/Dar_es_Salaam~~~abc
-/softwarestudio.org/Tzfile/Africa/Djibouti~~~abc
-/softwarestudio.org/Tzfile/Africa/Douala~~~abc
-/softwarestudio.org/Tzfile/Africa/El_Aaiun~~~abc
-/softwarestudio.org/Tzfile/Africa/Freetown~~~abc
-/softwarestudio.org/Tzfile/Africa/Gaborone~~~abc
-/softwarestudio.org/Tzfile/Africa/Harare~~~abc
-/softwarestudio.org/Tzfile/Africa/Johannesburg~~~abc
-/softwarestudio.org/Tzfile/Africa/Kampala~~~abc
-/softwarestudio.org/Tzfile/Africa/Khartoum~~~abc
-/softwarestudio.org/Tzfile/Africa/Kigali~~~abc
-/softwarestudio.org/Tzfile/Africa/Kinshasa~~~abc
-/softwarestudio.org/Tzfile/Africa/Lagos~~~abc
-/softwarestudio.org/Tzfile/Africa/Libreville~~~abc
-/softwarestudio.org/Tzfile/Africa/Lome~~~abc
-/softwarestudio.org/Tzfile/Africa/Luanda~~~abc
-/softwarestudio.org/Tzfile/Africa/Lubumbashi~~~abc
-/softwarestudio.org/Tzfile/Africa/Lusaka~~~abc
-/softwarestudio.org/Tzfile/Africa/Malabo~~~abc
-/softwarestudio.org/Tzfile/Africa/Maputo~~~abc
-/softwarestudio.org/Tzfile/Africa/Maseru~~~abc
-/softwarestudio.org/Tzfile/Africa/Mbabane~~~abc
-/softwarestudio.org/Tzfile/Africa/Mogadishu~~~abc
-/softwarestudio.org/Tzfile/Africa/Monrovia~~~abc
-/softwarestudio.org/Tzfile/Africa/Nairobi~~~abc
-/softwarestudio.org/Tzfile/Africa/Ndjamena~~~abc
-/softwarestudio.org/Tzfile/Africa/Niamey~~~abc
-/softwarestudio.org/Tzfile/Africa/Nouakchott~~~abc
-/softwarestudio.org/Tzfile/Africa/Ouagadougou~~~abc
-/softwarestudio.org/Tzfile/Africa/Porto-Novo~~~abc
-/softwarestudio.org/Tzfile/Africa/Sao_Tome~~~abc
-/softwarestudio.org/Tzfile/Africa/Tripoli~~~abc
-/softwarestudio.org/Tzfile/Africa/Tunis~~~abc
-/softwarestudio.org/Tzfile/Africa/Windhoek~~~abc
-/softwarestudio.org/Tzfile/America/Adak~~~abc
-/softwarestudio.org/Tzfile/America/Anchorage~~~abc
-/softwarestudio.org/Tzfile/America/Anguilla~~~abc
-/softwarestudio.org/Tzfile/America/Antigua~~~abc
-/softwarestudio.org/Tzfile/America/Araguaina~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Buenos_Aires~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Catamarca~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Cordoba~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Jujuy~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/La_Rioja~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Mendoza~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Rio_Gallegos~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/San_Juan~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Tucuman~~~abc
-/softwarestudio.org/Tzfile/America/Argentina/Ushuaia~~~abc
-/softwarestudio.org/Tzfile/America/Aruba~~~abc
-/softwarestudio.org/Tzfile/America/Asuncion~~~abc
-/softwarestudio.org/Tzfile/America/Atikokan~~~abc
-/softwarestudio.org/Tzfile/America/Bahia~~~abc
-/softwarestudio.org/Tzfile/America/Barbados~~~abc
-/softwarestudio.org/Tzfile/America/Belem~~~abc
-/softwarestudio.org/Tzfile/America/Belize~~~abc
-/softwarestudio.org/Tzfile/America/Blanc-Sablon~~~abc
-/softwarestudio.org/Tzfile/America/Boa_Vista~~~abc
-/softwarestudio.org/Tzfile/America/Bogota~~~abc
-/softwarestudio.org/Tzfile/America/Boise~~~abc
-/softwarestudio.org/Tzfile/America/Cambridge_Bay~~~abc
-/softwarestudio.org/Tzfile/America/Campo_Grande~~~abc
-/softwarestudio.org/Tzfile/America/Cancun~~~abc
-/softwarestudio.org/Tzfile/America/Caracas~~~abc
-/softwarestudio.org/Tzfile/America/Cayenne~~~abc
-/softwarestudio.org/Tzfile/America/Cayman~~~abc
-/softwarestudio.org/Tzfile/America/Chicago~~~abc
-/softwarestudio.org/Tzfile/America/Chihuahua~~~abc
-/softwarestudio.org/Tzfile/America/Costa_Rica~~~abc
-/softwarestudio.org/Tzfile/America/Cuiaba~~~abc
-/softwarestudio.org/Tzfile/America/Curacao~~~abc
-/softwarestudio.org/Tzfile/America/Danmarkshavn~~~abc
-/softwarestudio.org/Tzfile/America/Dawson~~~abc
-/softwarestudio.org/Tzfile/America/Dawson_Creek~~~abc
-/softwarestudio.org/Tzfile/America/Denver~~~abc
-/softwarestudio.org/Tzfile/America/Detroit~~~abc
-/softwarestudio.org/Tzfile/America/Dominica~~~abc
-/softwarestudio.org/Tzfile/America/Edmonton~~~abc
-/softwarestudio.org/Tzfile/America/Eirunepe~~~abc
-/softwarestudio.org/Tzfile/America/El_Salvador~~~abc
-/softwarestudio.org/Tzfile/America/Fortaleza~~~abc
-/softwarestudio.org/Tzfile/America/Glace_Bay~~~abc
-/softwarestudio.org/Tzfile/America/Godthab~~~abc
-/softwarestudio.org/Tzfile/America/Goose_Bay~~~abc
-/softwarestudio.org/Tzfile/America/Grand_Turk~~~abc
-/softwarestudio.org/Tzfile/America/Grenada~~~abc
-/softwarestudio.org/Tzfile/America/Guadeloupe~~~abc
-/softwarestudio.org/Tzfile/America/Guatemala~~~abc
-/softwarestudio.org/Tzfile/America/Guayaquil~~~abc
-/softwarestudio.org/Tzfile/America/Guyana~~~abc
-/softwarestudio.org/Tzfile/America/Halifax~~~abc
-/softwarestudio.org/Tzfile/America/Havana~~~abc
-/softwarestudio.org/Tzfile/America/Hermosillo~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Indianapolis~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Knox~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Marengo~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Petersburg~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Tell_City~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Vevay~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Vincennes~~~abc
-/softwarestudio.org/Tzfile/America/Indiana/Winamac~~~abc
-/softwarestudio.org/Tzfile/America/Inuvik~~~abc
-/softwarestudio.org/Tzfile/America/Iqaluit~~~abc
-/softwarestudio.org/Tzfile/America/Jamaica~~~abc
-/softwarestudio.org/Tzfile/America/Juneau~~~abc
-/softwarestudio.org/Tzfile/America/Kentucky/Louisville~~~abc
-/softwarestudio.org/Tzfile/America/Kentucky/Monticello~~~abc
-/softwarestudio.org/Tzfile/America/La_Paz~~~abc
-/softwarestudio.org/Tzfile/America/Lima~~~abc
-/softwarestudio.org/Tzfile/America/Los_Angeles~~~abc
-/softwarestudio.org/Tzfile/America/Maceio~~~abc
-/softwarestudio.org/Tzfile/America/Managua~~~abc
-/softwarestudio.org/Tzfile/America/Manaus~~~abc
-/softwarestudio.org/Tzfile/America/Martinique~~~abc
-/softwarestudio.org/Tzfile/America/Mazatlan~~~abc
-/softwarestudio.org/Tzfile/America/Menominee~~~abc
-/softwarestudio.org/Tzfile/America/Merida~~~abc
-/softwarestudio.org/Tzfile/America/Mexico_City~~~abc
-/softwarestudio.org/Tzfile/America/Miquelon~~~abc
-/softwarestudio.org/Tzfile/America/Moncton~~~abc
-/softwarestudio.org/Tzfile/America/Monterrey~~~abc
-/softwarestudio.org/Tzfile/America/Montevideo~~~abc
-/softwarestudio.org/Tzfile/America/Montreal~~~abc
-/softwarestudio.org/Tzfile/America/Montserrat~~~abc
-/softwarestudio.org/Tzfile/America/Nassau~~~abc
-/softwarestudio.org/Tzfile/America/New_York~~~abc
-/softwarestudio.org/Tzfile/America/Nipigon~~~abc
-/softwarestudio.org/Tzfile/America/Nome~~~abc
-/softwarestudio.org/Tzfile/America/Noronha~~~abc
-/softwarestudio.org/Tzfile/America/North_Dakota/Center~~~abc
-/softwarestudio.org/Tzfile/America/North_Dakota/New_Salem~~~abc
-/softwarestudio.org/Tzfile/America/Panama~~~abc
-/softwarestudio.org/Tzfile/America/Pangnirtung~~~abc
-/softwarestudio.org/Tzfile/America/Paramaribo~~~abc
-/softwarestudio.org/Tzfile/America/Phoenix~~~abc
-/softwarestudio.org/Tzfile/America/Port-au-Prince~~~abc
-/softwarestudio.org/Tzfile/America/Port_of_Spain~~~abc
-/softwarestudio.org/Tzfile/America/Porto_Velho~~~abc
-/softwarestudio.org/Tzfile/America/Puerto_Rico~~~abc
-/softwarestudio.org/Tzfile/America/Rainy_River~~~abc
-/softwarestudio.org/Tzfile/America/Rankin_Inlet~~~abc
-/softwarestudio.org/Tzfile/America/Recife~~~abc
-/softwarestudio.org/Tzfile/America/Regina~~~abc
-/softwarestudio.org/Tzfile/America/Resolute~~~abc
-/softwarestudio.org/Tzfile/America/Rio_Branco~~~abc
-/softwarestudio.org/Tzfile/America/Santiago~~~abc
-/softwarestudio.org/Tzfile/America/Santo_Domingo~~~abc
-/softwarestudio.org/Tzfile/America/Sao_Paulo~~~abc
-/softwarestudio.org/Tzfile/America/Scoresbysund~~~abc
-/softwarestudio.org/Tzfile/America/Shiprock~~~abc
-/softwarestudio.org/Tzfile/America/St_Johns~~~abc
-/softwarestudio.org/Tzfile/America/St_Kitts~~~abc
-/softwarestudio.org/Tzfile/America/St_Lucia~~~abc
-/softwarestudio.org/Tzfile/America/St_Thomas~~~abc
-/softwarestudio.org/Tzfile/America/St_Vincent~~~abc
-/softwarestudio.org/Tzfile/America/Swift_Current~~~abc
-/softwarestudio.org/Tzfile/America/Tegucigalpa~~~abc
-/softwarestudio.org/Tzfile/America/Thule~~~abc
-/softwarestudio.org/Tzfile/America/Thunder_Bay~~~abc
-/softwarestudio.org/Tzfile/America/Tijuana~~~abc
-/softwarestudio.org/Tzfile/America/Toronto~~~abc
-/softwarestudio.org/Tzfile/America/Tortola~~~abc
-/softwarestudio.org/Tzfile/America/Vancouver~~~abc
-/softwarestudio.org/Tzfile/America/Whitehorse~~~abc
-/softwarestudio.org/Tzfile/America/Winnipeg~~~abc
-/softwarestudio.org/Tzfile/America/Yakutat~~~abc
-/softwarestudio.org/Tzfile/America/Yellowknife~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Casey~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Davis~~~abc
-/softwarestudio.org/Tzfile/Antarctica/DumontDUrville~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Mawson~~~abc
-/softwarestudio.org/Tzfile/Antarctica/McMurdo~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Palmer~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Rothera~~~abc
-/softwarestudio.org/Tzfile/Antarctica/South_Pole~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Syowa~~~abc
-/softwarestudio.org/Tzfile/Antarctica/Vostok~~~abc
-/softwarestudio.org/Tzfile/Arctic/Longyearbyen~~~abc
-/softwarestudio.org/Tzfile/Asia/Aden~~~abc
-/softwarestudio.org/Tzfile/Asia/Almaty~~~abc
-/softwarestudio.org/Tzfile/Asia/Amman~~~abc
-/softwarestudio.org/Tzfile/Asia/Anadyr~~~abc
-/softwarestudio.org/Tzfile/Asia/Aqtau~~~abc
-/softwarestudio.org/Tzfile/Asia/Aqtobe~~~abc
-/softwarestudio.org/Tzfile/Asia/Ashgabat~~~abc
-/softwarestudio.org/Tzfile/Asia/Baghdad~~~abc
-/softwarestudio.org/Tzfile/Asia/Bahrain~~~abc
-/softwarestudio.org/Tzfile/Asia/Baku~~~abc
-/softwarestudio.org/Tzfile/Asia/Bangkok~~~abc
-/softwarestudio.org/Tzfile/Asia/Beijing~~~abc
-/softwarestudio.org/Tzfile/Asia/Beirut~~~abc
-/softwarestudio.org/Tzfile/Asia/Bishkek~~~abc
-/softwarestudio.org/Tzfile/Asia/Brunei~~~abc
+/softwarestudio.org/Tzfile/Africa/Abidjan~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Accra~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Addis_Ababa~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Algiers~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Asmara~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Bamako~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Bangui~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Banjul~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Bissau~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Blantyre~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Brazzaville~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Bujumbura~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Cairo~~~Egypt Standard Time
+/softwarestudio.org/Tzfile/Africa/Casablanca~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Ceuta~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Conakry~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Dakar~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Dar_es_Salaam~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Djibouti~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Douala~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/El_Aaiun~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Freetown~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Gaborone~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Harare~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Johannesburg~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Kampala~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Khartoum~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Kigali~~~Egypt Standard Time
+/softwarestudio.org/Tzfile/Africa/Kinshasa~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Lagos~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Libreville~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Lome~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Luanda~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Lubumbashi~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Lusaka~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Malabo~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Maputo~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Maseru~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Mbabane~~~South Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Mogadishu~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Monrovia~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Nairobi~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Ndjamena~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Niamey~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Nouakchott~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Ouagadougou~~~Greenwich Standard Time
+/softwarestudio.org/Tzfile/Africa/Porto-Novo~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Sao_Tome~~~Cape Verde Standard Time
+/softwarestudio.org/Tzfile/Africa/Tripoli~~~Egypt Standard Time
+/softwarestudio.org/Tzfile/Africa/Tunis~~~W. Central Africa Standard Time
+/softwarestudio.org/Tzfile/Africa/Windhoek~~~Namibia Standard Time
+/softwarestudio.org/Tzfile/America/Adak~~~Hawaiian Standard Time
+/softwarestudio.org/Tzfile/America/Anchorage~~~Alaskan Standard Time
+/softwarestudio.org/Tzfile/America/Anguilla~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Antigua~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Araguaina~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Buenos_Aires~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Catamarca~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Cordoba~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Jujuy~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/La_Rioja~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Mendoza~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Rio_Gallegos~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/San_Juan~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Tucuman~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Argentina/Ushuaia~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Aruba~~~Venezuela Standard Time
+/softwarestudio.org/Tzfile/America/Asuncion~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Atikokan~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Bahia~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Barbados~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Belem~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Belize~~~Mexico Standard Time
+/softwarestudio.org/Tzfile/America/Blanc-Sablon~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Boa_Vista~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Bogota~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Boise~~~US Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Cambridge_Bay~~~Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Campo_Grande~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Cancun~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Caracas~~~Venezuela Standard Time
+/softwarestudio.org/Tzfile/America/Cayenne~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Cayman~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Chicago~~~Central Standard Time
+/softwarestudio.org/Tzfile/America/Chihuahua~~~Mexico Standard Time 2
+/softwarestudio.org/Tzfile/America/Costa_Rica~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Cuiaba~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Curacao~~~Venezuela Standard Time
+/softwarestudio.org/Tzfile/America/Danmarkshavn~~~GMT Standard Time
+/softwarestudio.org/Tzfile/America/Dawson~~~Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Dawson_Creek~~~Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Denver~~~Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Detroit~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Dominica~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Edmonton~~~Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Eirunepe~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/El_Salvador~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Fortaleza~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Glace_Bay~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Godthab~~~Greenland Standard Time
+/softwarestudio.org/Tzfile/America/Goose_Bay~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Grand_Turk~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Grenada~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Guadeloupe~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Guatemala~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Guayaquil~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Guyana~~~Venezuela Standard Time
+/softwarestudio.org/Tzfile/America/Halifax~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Havana~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Hermosillo~~~Mexico Standard Time 2
+/softwarestudio.org/Tzfile/America/Indiana/Indianapolis~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Knox~~~Canada Central Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Marengo~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Petersburg~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Tell_City~~~Canada Central Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Vevay~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Vincennes~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Indiana/Winamac~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Inuvik~~~Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Iqaluit~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Jamaica~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Juneau~~~Alaskan Standard Time
+/softwarestudio.org/Tzfile/America/Kentucky/Louisville~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Kentucky/Monticello~~~US Eastern Standard Time
+/softwarestudio.org/Tzfile/America/La_Paz~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Lima~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Los_Angeles~~~Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Maceio~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Managua~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Manaus~~~Central Brazilian Standard Time
+/softwarestudio.org/Tzfile/America/Martinique~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Mazatlan~~~Mountain Standard Time (Mexico)
+/softwarestudio.org/Tzfile/America/Menominee~~~Central Standard Time
+/softwarestudio.org/Tzfile/America/Merida~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Mexico_City~~~Mexico Standard Time
+/softwarestudio.org/Tzfile/America/Miquelon~~~Greenland Standard Time
+/softwarestudio.org/Tzfile/America/Moncton~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Monterrey~~~Central Standard Time (Mexico)
+/softwarestudio.org/Tzfile/America/Montevideo~~~Montevideo Standard Time
+/softwarestudio.org/Tzfile/America/Montreal~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Montserrat~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Nassau~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/New_York~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Nipigon~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Nome~~~Alaskan Standard Time
+/softwarestudio.org/Tzfile/America/Noronha~~~Mid-Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/North_Dakota/Center~~~Central Standard Time
+/softwarestudio.org/Tzfile/America/North_Dakota/New_Salem~~~Central Standard Time
+/softwarestudio.org/Tzfile/America/Panama~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Pangnirtung~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Paramaribo~~~Venezuela Standard Time
+/softwarestudio.org/Tzfile/America/Phoenix~~~US Mountain Standard Time
+/softwarestudio.org/Tzfile/America/Port-au-Prince~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Port_of_Spain~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Porto_Velho~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Puerto_Rico~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Rainy_River~~~Canada Central Standard Time
+/softwarestudio.org/Tzfile/America/Rankin_Inlet~~~Canada Central Standard Time
+/softwarestudio.org/Tzfile/America/Recife~~~E. South America Standard Time
+/softwarestudio.org/Tzfile/America/Regina~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Resolute~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Rio_Branco~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Santiago~~~Pacific SA Standard Time
+/softwarestudio.org/Tzfile/America/Santo_Domingo~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Sao_Paulo~~~Mid-Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Scoresbysund~~~Azores Standard Time
+/softwarestudio.org/Tzfile/America/Shiprock~~~US Mountain Standard Time
+/softwarestudio.org/Tzfile/America/St_Johns~~~Newfoundland Standard Time
+/softwarestudio.org/Tzfile/America/St_Kitts~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/St_Lucia~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/St_Thomas~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/St_Vincent~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Swift_Current~~~Central Standard Time
+/softwarestudio.org/Tzfile/America/Tegucigalpa~~~Central America Standard Time
+/softwarestudio.org/Tzfile/America/Thule~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/America/Thunder_Bay~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Tijuana~~~Pacific Standard Time (Mexico)
+/softwarestudio.org/Tzfile/America/Toronto~~~Eastern Standard Time
+/softwarestudio.org/Tzfile/America/Tortola~~~SA Western Standard Time
+/softwarestudio.org/Tzfile/America/Vancouver~~~Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Whitehorse~~~Pacific Standard Time
+/softwarestudio.org/Tzfile/America/Winnipeg~~~Canada Central Standard Time
+/softwarestudio.org/Tzfile/America/Yakutat~~~Alaskan Standard Time
+/softwarestudio.org/Tzfile/America/Yellowknife~~~Mountain Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Casey~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Davis~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Antarctica/DumontDUrville~~~West Pacific Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Mawson~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Antarctica/McMurdo~~~Tonga Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Palmer~~~Greenland Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Rothera~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Antarctica/South_Pole~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Syowa~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Antarctica/Vostok~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Arctic/Longyearbyen~~~Central Europe Standard Time
+/softwarestudio.org/Tzfile/Asia/Aden~~~Arab Standard Time
+/softwarestudio.org/Tzfile/Asia/Almaty~~~N. Central Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Amman~~~Israel Standard Time
+/softwarestudio.org/Tzfile/Asia/Anadyr~~~Fiji Standard Time
+/softwarestudio.org/Tzfile/Asia/Aqtau~~~Ekaterinburg Standard Time
+/softwarestudio.org/Tzfile/Asia/Aqtobe~~~Ekaterinburg Standard Time
+/softwarestudio.org/Tzfile/Asia/Ashgabat~~~Ekaterinburg Standard Time
+/softwarestudio.org/Tzfile/Asia/Baghdad~~~Arabic Standard Time
+/softwarestudio.org/Tzfile/Asia/Bahrain~~~Arab Standard Time
+/softwarestudio.org/Tzfile/Asia/Baku~~~Caucasus Standard Time
+/softwarestudio.org/Tzfile/Asia/Bangkok~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Beijing~~~China Standard Time
+/softwarestudio.org/Tzfile/Asia/Beirut~~~Israel Standard Time
+/softwarestudio.org/Tzfile/Asia/Bishkek~~~Central Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Brunei~~~Taipei Standard Time
 /softwarestudio.org/Tzfile/Asia/Calcutta~~~India Standard Time
-/softwarestudio.org/Tzfile/Asia/Choibalsan~~~abc
+/softwarestudio.org/Tzfile/Asia/Choibalsan~~~Yakutsk Standard Time
 /softwarestudio.org/Tzfile/Asia/Chongqing~~~China Standard Time
-/softwarestudio.org/Tzfile/Asia/Colombo~~~abc
-/softwarestudio.org/Tzfile/Asia/Damascus~~~abc
-/softwarestudio.org/Tzfile/Asia/Dhaka~~~abc
-/softwarestudio.org/Tzfile/Asia/Dili~~~abc
-/softwarestudio.org/Tzfile/Asia/Dubai~~~abc
-/softwarestudio.org/Tzfile/Asia/Dushanbe~~~abc
-/softwarestudio.org/Tzfile/Asia/Gaza~~~abc
-/softwarestudio.org/Tzfile/Asia/Harbin~~~abc
+/softwarestudio.org/Tzfile/Asia/Colombo~~~India Standard Time
+/softwarestudio.org/Tzfile/Asia/Damascus~~~Israel Standard Time
+/softwarestudio.org/Tzfile/Asia/Dhaka~~~Central Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Dili~~~Yakutsk Standard Time
+/softwarestudio.org/Tzfile/Asia/Dubai~~~Iran Standard Time
+/softwarestudio.org/Tzfile/Asia/Dushanbe~~~West Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Gaza~~~Israel Standard Time
+/softwarestudio.org/Tzfile/Asia/Harbin~~~China Standard Time
 /softwarestudio.org/Tzfile/Asia/Hong_Kong~~~China Standard Time
-/softwarestudio.org/Tzfile/Asia/Hovd~~~abc
+/softwarestudio.org/Tzfile/Asia/Hovd~~~North Asia Standard Time
 /softwarestudio.org/Tzfile/Asia/Irkutsk~~~North Asia East Standard Time
-/softwarestudio.org/Tzfile/Asia/Jakarta~~~abc
-/softwarestudio.org/Tzfile/Asia/Jayapura~~~abc
-/softwarestudio.org/Tzfile/Asia/Jerusalem~~~abc
-/softwarestudio.org/Tzfile/Asia/Kabul~~~abc
+/softwarestudio.org/Tzfile/Asia/Jakarta~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Jayapura~~~Yakutsk Standard Time
+/softwarestudio.org/Tzfile/Asia/Jerusalem~~~Israel Standard Time
+/softwarestudio.org/Tzfile/Asia/Kabul~~~Afghanistan Standard Time
 /softwarestudio.org/Tzfile/Asia/Kamchatka~~~Fiji Standard Time
-/softwarestudio.org/Tzfile/Asia/Karachi~~~abc
-/softwarestudio.org/Tzfile/Asia/Kashgar~~~abc
-/softwarestudio.org/Tzfile/Asia/Katmandu~~~abc
+/softwarestudio.org/Tzfile/Asia/Karachi~~~West Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Kashgar~~~China Standard Time
+/softwarestudio.org/Tzfile/Asia/Katmandu~~~Nepal Standard Time
 /softwarestudio.org/Tzfile/Asia/Krasnoyarsk~~~North Asia Standard Time
 /softwarestudio.org/Tzfile/Asia/Kuala_Lumpur~~~Singapore Standard Time
-/softwarestudio.org/Tzfile/Asia/Kuching~~~abc
-/softwarestudio.org/Tzfile/Asia/Kuwait~~~abc
-/softwarestudio.org/Tzfile/Asia/Macau~~~abc
+/softwarestudio.org/Tzfile/Asia/Kuching~~~Taipei Standard Time
+/softwarestudio.org/Tzfile/Asia/Kuwait~~~Arab Standard Time
+/softwarestudio.org/Tzfile/Asia/Macau~~~China Standard Time
 /softwarestudio.org/Tzfile/Asia/Magadan~~~Central Pacific Standard Time
-/softwarestudio.org/Tzfile/Asia/Makassar~~~abc
-/softwarestudio.org/Tzfile/Asia/Manila~~~abc
-/softwarestudio.org/Tzfile/Asia/Muscat~~~abc
-/softwarestudio.org/Tzfile/Asia/Nicosia~~~abc
-/softwarestudio.org/Tzfile/Asia/Novosibirsk~~~abc
-/softwarestudio.org/Tzfile/Asia/Omsk~~~abc
-/softwarestudio.org/Tzfile/Asia/Oral~~~abc
-/softwarestudio.org/Tzfile/Asia/Phnom_Penh~~~abc
-/softwarestudio.org/Tzfile/Asia/Pontianak~~~abc
-/softwarestudio.org/Tzfile/Asia/Pyongyang~~~abc
-/softwarestudio.org/Tzfile/Asia/Qatar~~~abc
-/softwarestudio.org/Tzfile/Asia/Qyzylorda~~~abc
-/softwarestudio.org/Tzfile/Asia/Rangoon~~~abc
-/softwarestudio.org/Tzfile/Asia/Riyadh~~~abc
-/softwarestudio.org/Tzfile/Asia/Saigon~~~abc
-/softwarestudio.org/Tzfile/Asia/Sakhalin~~~abc
-/softwarestudio.org/Tzfile/Asia/Samarkand~~~abc
+/softwarestudio.org/Tzfile/Asia/Makassar~~~Taipei Standard Time
+/softwarestudio.org/Tzfile/Asia/Manila~~~Taipei Standard Time
+/softwarestudio.org/Tzfile/Asia/Muscat~~~Arabian Standard Time
+/softwarestudio.org/Tzfile/Asia/Nicosia~~~Israel Standard Time
+/softwarestudio.org/Tzfile/Asia/Novosibirsk~~~N. Central Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Omsk~~~N. Central Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Oral~~~Ekaterinburg Standard Time
+/softwarestudio.org/Tzfile/Asia/Phnom_Penh~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Pontianak~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Pyongyang~~~Korea Standard Time
+/softwarestudio.org/Tzfile/Asia/Qatar~~~Arab Standard Time
+/softwarestudio.org/Tzfile/Asia/Qyzylorda~~~Central Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Rangoon~~~Myanmar Standard Time
+/softwarestudio.org/Tzfile/Asia/Riyadh~~~Arab Standard Time
+/softwarestudio.org/Tzfile/Asia/Saigon~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Sakhalin~~~Vladivostok Standard Time
+/softwarestudio.org/Tzfile/Asia/Samarkand~~~West Asia Standard Time
 /softwarestudio.org/Tzfile/Asia/Seoul~~~Korea Standard Time
-/softwarestudio.org/Tzfile/Asia/Shanghai~~~abc
+/softwarestudio.org/Tzfile/Asia/Shanghai~~~China Standard Time
 /softwarestudio.org/Tzfile/Asia/Singapore~~~Singapore Standard Time
 /softwarestudio.org/Tzfile/Asia/Taipei~~~Taipei Standard Time
-/softwarestudio.org/Tzfile/Asia/Tashkent~~~abc
-/softwarestudio.org/Tzfile/Asia/Tbilisi~~~abc
-/softwarestudio.org/Tzfile/Asia/Tehran~~~abc
-/softwarestudio.org/Tzfile/Asia/Thimphu~~~abc
+/softwarestudio.org/Tzfile/Asia/Tashkent~~~West Asia Standard Time
+/softwarestudio.org/Tzfile/Asia/Tbilisi~~~Georgian Standard Time
+/softwarestudio.org/Tzfile/Asia/Tehran~~~Iran Standard Time
+/softwarestudio.org/Tzfile/Asia/Thimphu~~~Central Asia Standard Time
 /softwarestudio.org/Tzfile/Asia/Tokyo~~~Tokyo Standard Time
 /softwarestudio.org/Tzfile/Asia/Ulaanbaatar~~~North Asia East Standard Time
 /softwarestudio.org/Tzfile/Asia/Urumqi~~~China Standard Time
-/softwarestudio.org/Tzfile/Asia/Vientiane~~~abc
+/softwarestudio.org/Tzfile/Asia/Vientiane~~~SE Asia Standard Time
 /softwarestudio.org/Tzfile/Asia/Vladivostok~~~Vladivostok Standard Time
 /softwarestudio.org/Tzfile/Asia/Yakutsk~~~Yakutsk Standard Time
-/softwarestudio.org/Tzfile/Asia/Yekaterinburg~~~abc
-/softwarestudio.org/Tzfile/Asia/Yerevan~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Azores~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Bermuda~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Canary~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Cape_Verde~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Faroe~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Jan_Mayen~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Madeira~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Reykjavik~~~abc
-/softwarestudio.org/Tzfile/Atlantic/South_Georgia~~~abc
-/softwarestudio.org/Tzfile/Atlantic/Stanley~~~abc
-/softwarestudio.org/Tzfile/Atlantic/St_Helena~~~abc
+/softwarestudio.org/Tzfile/Asia/Yekaterinburg~~~Ekaterinburg Standard Time
+/softwarestudio.org/Tzfile/Asia/Yerevan~~~Armenian Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Azores~~~Azores Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Bermuda~~~Atlantic Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Canary~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Cape_Verde~~~Cape Verde Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Faroe~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Jan_Mayen~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Madeira~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Reykjavik~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Atlantic/South_Georgia~~~Mid-Atlantic Standard Time
+/softwarestudio.org/Tzfile/Atlantic/Stanley~~~SA Eastern Standard Time
+/softwarestudio.org/Tzfile/Atlantic/St_Helena~~~Greenwich Standard Time
 /softwarestudio.org/Tzfile/Australia/Adelaide~~~Cen. Australia Standard Time
 /softwarestudio.org/Tzfile/Australia/Brisbane~~~E. Australia Standard Time
-/softwarestudio.org/Tzfile/Australia/Broken_Hill~~~abc
-/softwarestudio.org/Tzfile/Australia/Currie~~~abc
+/softwarestudio.org/Tzfile/Australia/Broken_Hill~~~Cen. Australia Standard Time
+/softwarestudio.org/Tzfile/Australia/Currie~~~AUS Eastern Standard Time
 /softwarestudio.org/Tzfile/Australia/Darwin~~~AUS Central Standard Time
-/softwarestudio.org/Tzfile/Australia/Eucla~~~abc
+/softwarestudio.org/Tzfile/Australia/Eucla~~~AUS Central Standard Time
 /softwarestudio.org/Tzfile/Australia/Hobart~~~Tasmania Standard Time
-/softwarestudio.org/Tzfile/Australia/Lindeman~~~abc
-/softwarestudio.org/Tzfile/Australia/Lord_Howe~~~abc
+/softwarestudio.org/Tzfile/Australia/Lindeman~~~E. Australia Standard Time
+/softwarestudio.org/Tzfile/Australia/Lord_Howe~~~AUS Eastern Standard Time
 /softwarestudio.org/Tzfile/Australia/Melbourne~~~AUS Eastern Standard Time
 /softwarestudio.org/Tzfile/Australia/Perth~~~W. Australia Standard Time
 /softwarestudio.org/Tzfile/Australia/Sydney~~~AUS Eastern Standard Time
-/softwarestudio.org/Tzfile/Europe/Amsterdam~~~abc
-/softwarestudio.org/Tzfile/Europe/Andorra~~~abc
-/softwarestudio.org/Tzfile/Europe/Athens~~~abc
-/softwarestudio.org/Tzfile/Europe/Belgrade~~~abc
-/softwarestudio.org/Tzfile/Europe/Berlin~~~abc
-/softwarestudio.org/Tzfile/Europe/Bratislava~~~abc
-/softwarestudio.org/Tzfile/Europe/Brussels~~~abc
-/softwarestudio.org/Tzfile/Europe/Bucharest~~~abc
-/softwarestudio.org/Tzfile/Europe/Budapest~~~abc
-/softwarestudio.org/Tzfile/Europe/Chisinau~~~abc
-/softwarestudio.org/Tzfile/Europe/Copenhagen~~~abc
-/softwarestudio.org/Tzfile/Europe/Dublin~~~abc
-/softwarestudio.org/Tzfile/Europe/Gibraltar~~~abc
-/softwarestudio.org/Tzfile/Europe/Guernsey~~~abc
-/softwarestudio.org/Tzfile/Europe/Helsinki~~~abc
-/softwarestudio.org/Tzfile/Europe/Isle_of_Man~~~abc
-/softwarestudio.org/Tzfile/Europe/Istanbul~~~abc
-/softwarestudio.org/Tzfile/Europe/Jersey~~~abc
-/softwarestudio.org/Tzfile/Europe/Kaliningrad~~~abc
-/softwarestudio.org/Tzfile/Europe/Kiev~~~abc
-/softwarestudio.org/Tzfile/Europe/Lisbon~~~abc
-/softwarestudio.org/Tzfile/Europe/Ljubljana~~~abc
-/softwarestudio.org/Tzfile/Europe/London~~~abc
-/softwarestudio.org/Tzfile/Europe/Luxembourg~~~abc
-/softwarestudio.org/Tzfile/Europe/Madrid~~~abc
-/softwarestudio.org/Tzfile/Europe/Malta~~~abc
-/softwarestudio.org/Tzfile/Europe/Mariehamn~~~abc
-/softwarestudio.org/Tzfile/Europe/Minsk~~~abc
-/softwarestudio.org/Tzfile/Europe/Monaco~~~abc
-/softwarestudio.org/Tzfile/Europe/Moscow~~~abc
-/softwarestudio.org/Tzfile/Europe/Oslo~~~abc
-/softwarestudio.org/Tzfile/Europe/Paris~~~abc
-/softwarestudio.org/Tzfile/Europe/Podgorica~~~abc
-/softwarestudio.org/Tzfile/Europe/Prague~~~abc
-/softwarestudio.org/Tzfile/Europe/Riga~~~abc
-/softwarestudio.org/Tzfile/Europe/Rome~~~abc
-/softwarestudio.org/Tzfile/Europe/Samara~~~abc
-/softwarestudio.org/Tzfile/Europe/San_Marino~~~abc
-/softwarestudio.org/Tzfile/Europe/Sarajevo~~~abc
-/softwarestudio.org/Tzfile/Europe/Simferopol~~~abc
-/softwarestudio.org/Tzfile/Europe/Skopje~~~abc
-/softwarestudio.org/Tzfile/Europe/Sofia~~~abc
-/softwarestudio.org/Tzfile/Europe/Stockholm~~~abc
-/softwarestudio.org/Tzfile/Europe/Tallinn~~~abc
-/softwarestudio.org/Tzfile/Europe/Tirane~~~abc
-/softwarestudio.org/Tzfile/Europe/Uzhgorod~~~abc
-/softwarestudio.org/Tzfile/Europe/Vaduz~~~abc
-/softwarestudio.org/Tzfile/Europe/Vatican~~~abc
-/softwarestudio.org/Tzfile/Europe/Vienna~~~abc
-/softwarestudio.org/Tzfile/Europe/Vilnius~~~abc
-/softwarestudio.org/Tzfile/Europe/Volgograd~~~abc
-/softwarestudio.org/Tzfile/Europe/Warsaw~~~abc
-/softwarestudio.org/Tzfile/Europe/Zagreb~~~abc
-/softwarestudio.org/Tzfile/Europe/Zaporozhye~~~abc
-/softwarestudio.org/Tzfile/Europe/Zurich~~~abc
-/softwarestudio.org/Tzfile/Indian/Antananarivo~~~abc
-/softwarestudio.org/Tzfile/Indian/Chagos~~~abc
-/softwarestudio.org/Tzfile/Indian/Christmas~~~abc
-/softwarestudio.org/Tzfile/Indian/Cocos~~~abc
-/softwarestudio.org/Tzfile/Indian/Comoro~~~abc
-/softwarestudio.org/Tzfile/Indian/Kerguelen~~~abc
-/softwarestudio.org/Tzfile/Indian/Mahe~~~abc
-/softwarestudio.org/Tzfile/Indian/Maldives~~~abc
-/softwarestudio.org/Tzfile/Indian/Mauritius~~~abc
-/softwarestudio.org/Tzfile/Indian/Mayotte~~~abc
-/softwarestudio.org/Tzfile/Indian/Reunion~~~abc
-/softwarestudio.org/Tzfile/Pacific/Apia~~~abc
+/softwarestudio.org/Tzfile/Europe/Amsterdam~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Andorra~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Athens~~~GTB Standard Time
+/softwarestudio.org/Tzfile/Europe/Belgrade~~~Central Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Berlin~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Bratislava~~~Central Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Brussels~~~Romance Standard Time
+/softwarestudio.org/Tzfile/Europe/Bucharest~~~E. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Budapest~~~Central Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Chisinau~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Copenhagen~~~Romance Standard Time
+/softwarestudio.org/Tzfile/Europe/Dublin~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Europe/Gibraltar~~~Romance Standard Time
+/softwarestudio.org/Tzfile/Europe/Guernsey~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Europe/Helsinki~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Isle_of_Man~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Europe/Istanbul~~~GTB Standard Time
+/softwarestudio.org/Tzfile/Europe/Jersey~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Europe/Kaliningrad~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Kiev~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Lisbon~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Europe/Ljubljana~~~Central Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/London~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Europe/Luxembourg~~~Romance Standard Time
+/softwarestudio.org/Tzfile/Europe/Madrid~~~Romance Standard Time
+/softwarestudio.org/Tzfile/Europe/Malta~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Mariehamn~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Minsk~~~E. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Monaco~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Moscow~~~Russian Standard Time
+/softwarestudio.org/Tzfile/Europe/Oslo~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Paris~~~Romance Standard Time
+/softwarestudio.org/Tzfile/Europe/Podgorica~~~Central European Standard Time
+/softwarestudio.org/Tzfile/Europe/Prague~~~Central Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Riga~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Rome~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Samara~~~Caucasus Standard Time
+/softwarestudio.org/Tzfile/Europe/San_Marino~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Sarajevo~~~Central European Standard Time
+/softwarestudio.org/Tzfile/Europe/Simferopol~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Skopje~~~Central European Standard Time
+/softwarestudio.org/Tzfile/Europe/Sofia~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Stockholm~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Tallinn~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Tirane~~~Central European Standard Time
+/softwarestudio.org/Tzfile/Europe/Uzhgorod~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Vaduz~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Vatican~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Vienna~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Europe/Vilnius~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Volgograd~~~Russian Standard Time
+/softwarestudio.org/Tzfile/Europe/Warsaw~~~Central European Standard Time
+/softwarestudio.org/Tzfile/Europe/Zagreb~~~Central European Standard Time
+/softwarestudio.org/Tzfile/Europe/Zaporozhye~~~FLE Standard Time
+/softwarestudio.org/Tzfile/Europe/Zurich~~~W. Europe Standard Time
+/softwarestudio.org/Tzfile/Indian/Antananarivo~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Indian/Chagos~~~Sri Lanka Standard Time
+/softwarestudio.org/Tzfile/Indian/Christmas~~~SE Asia Standard Time
+/softwarestudio.org/Tzfile/Indian/Cocos~~~Myanmar Standard Time
+/softwarestudio.org/Tzfile/Indian/Comoro~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Indian/Kerguelen~~~GMT Standard Time
+/softwarestudio.org/Tzfile/Indian/Mahe~~~Iran Standard Time
+/softwarestudio.org/Tzfile/Indian/Maldives~~~West Asia Standard Time
+/softwarestudio.org/Tzfile/Indian/Mauritius~~~Arabian Standard Time
+/softwarestudio.org/Tzfile/Indian/Mayotte~~~E. Africa Standard Time
+/softwarestudio.org/Tzfile/Indian/Reunion~~~Iran Standard Time
+/softwarestudio.org/Tzfile/Pacific/Apia~~~Dateline Standard Time
 /softwarestudio.org/Tzfile/Pacific/Auckland~~~New Zealand Standard Time
-/softwarestudio.org/Tzfile/Pacific/Chatham~~~abc
-/softwarestudio.org/Tzfile/Pacific/Easter~~~abc
-/softwarestudio.org/Tzfile/Pacific/Efate~~~abc
-/softwarestudio.org/Tzfile/Pacific/Enderbury~~~abc
-/softwarestudio.org/Tzfile/Pacific/Fakaofo~~~abc
-/softwarestudio.org/Tzfile/Pacific/Fiji~~~Fiji Standard Time
-/softwarestudio.org/Tzfile/Pacific/Funafuti~~~abc
-/softwarestudio.org/Tzfile/Pacific/Galapagos~~~abc
-/softwarestudio.org/Tzfile/Pacific/Gambier~~~abc
-/softwarestudio.org/Tzfile/Pacific/Guadalcanal~~~abc
+/softwarestudio.org/Tzfile/Pacific/Chatham~~~Tonga Standard Time
+/softwarestudio.org/Tzfile/Pacific/Easter~~~SA Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Efate~~~Central Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Enderbury~~~Tonga Standard Time
+/softwarestudio.org/Tzfile/Pacific/Fakaofo~~~Hawaiian Standard Time
+/softwarestudio.org/Tzfile/Pacific/Fiji~~~Central Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Funafuti~~~Fiji Standard Time
+/softwarestudio.org/Tzfile/Pacific/Galapagos~~~Mexico Standard Time
+/softwarestudio.org/Tzfile/Pacific/Gambier~~~Alaskan Standard Time
+/softwarestudio.org/Tzfile/Pacific/Guadalcanal~~~Central Pacific Standard Time
 /softwarestudio.org/Tzfile/Pacific/Guam~~~West Pacific Standard Time
 /softwarestudio.org/Tzfile/Pacific/Honolulu~~~Hawaiian Standard Time
-/softwarestudio.org/Tzfile/Pacific/Johnston~~~abc
-/softwarestudio.org/Tzfile/Pacific/Kiritimati~~~abc
-/softwarestudio.org/Tzfile/Pacific/Kosrae~~~abc
-/softwarestudio.org/Tzfile/Pacific/Kwajalein~~~abc
-/softwarestudio.org/Tzfile/Pacific/Majuro~~~abc
-/softwarestudio.org/Tzfile/Pacific/Marquesas~~~abc
+/softwarestudio.org/Tzfile/Pacific/Johnston~~~Hawaiian Standard Time
+/softwarestudio.org/Tzfile/Pacific/Kiritimati~~~Tonga Standard Time
+/softwarestudio.org/Tzfile/Pacific/Kosrae~~~Central Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Kwajalein~~~Fiji Standard Time
+/softwarestudio.org/Tzfile/Pacific/Majuro~~~Central Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Marquesas~~~Alaskan Standard Time
 /softwarestudio.org/Tzfile/Pacific/Midway~~~Samoa Standard Time
-/softwarestudio.org/Tzfile/Pacific/Nauru~~~abc
-/softwarestudio.org/Tzfile/Pacific/Niue~~~abc
-/softwarestudio.org/Tzfile/Pacific/Norfolk~~~abc
-/softwarestudio.org/Tzfile/Pacific/Noumea~~~abc
-/softwarestudio.org/Tzfile/Pacific/Pago_Pago~~~abc
-/softwarestudio.org/Tzfile/Pacific/Palau~~~abc
-/softwarestudio.org/Tzfile/Pacific/Pitcairn~~~abc
-/softwarestudio.org/Tzfile/Pacific/Ponape~~~abc
+/softwarestudio.org/Tzfile/Pacific/Nauru~~~Fiji Standard Time
+/softwarestudio.org/Tzfile/Pacific/Niue~~~Samoa Standard Time
+/softwarestudio.org/Tzfile/Pacific/Norfolk~~~Central Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Noumea~~~Central Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Pago_Pago~~~Samoa Standard Time
+/softwarestudio.org/Tzfile/Pacific/Palau~~~Yakutsk Standard Time
+/softwarestudio.org/Tzfile/Pacific/Pitcairn~~~Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Ponape~~~Central Pacific Standard Time
 /softwarestudio.org/Tzfile/Pacific/Port_Moresby~~~West Pacific Standard Time
-/softwarestudio.org/Tzfile/Pacific/Rarotonga~~~abc
-/softwarestudio.org/Tzfile/Pacific/Saipan~~~abc
-/softwarestudio.org/Tzfile/Pacific/Tahiti~~~abc
-/softwarestudio.org/Tzfile/Pacific/Tarawa~~~abc
+/softwarestudio.org/Tzfile/Pacific/Rarotonga~~~Hawaiian Standard Time
+/softwarestudio.org/Tzfile/Pacific/Saipan~~~West Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Tahiti~~~Hawaiian Standard Time
+/softwarestudio.org/Tzfile/Pacific/Tarawa~~~Fiji Standard Time
 /softwarestudio.org/Tzfile/Pacific/Tongatapu~~~Tonga Standard Time
-/softwarestudio.org/Tzfile/Pacific/Truk~~~abc
-/softwarestudio.org/Tzfile/Pacific/Wake~~~abc
-/softwarestudio.org/Tzfile/Pacific/Wallis~~~abc
+/softwarestudio.org/Tzfile/Pacific/Truk~~~West Pacific Standard Time
+/softwarestudio.org/Tzfile/Pacific/Wake~~~Fiji Standard Time
+/softwarestudio.org/Tzfile/Pacific/Wallis~~~Fiji Standard Time

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-mapi-to-ical
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-mapi-to-ical	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/tz-mapi-to-ical	Fri Jan 18 10:44:44 2008
@@ -3,14 +3,14 @@
 Hawaiian Standard Time~~~/softwarestudio.org/Tzfile/Pacific/Honolulu
 Alaskan Standard Time~~~/softwarestudio.org/Tzfile/America/Anchorage
 Pacific Standard Time~~~/softwarestudio.org/Tzfile/America/Los_Angeles
-Pacific Standard Time Mexico~~~/softwarestudio.org/Tzfile/America/Tijuana
+Pacific Standard Time (Mexico)~~~/softwarestudio.org/Tzfile/America/Tijuana
 US Mountain Standard Time~~~/softwarestudio.org/Tzfile/America/Phoenix
-Mountain Standard Time Mexico~~~/softwarestudio.org/Tzfile/America/Mazatlan
+Mountain Standard Time (Mexico)~~~/softwarestudio.org/Tzfile/America/Mazatlan
 Mexico Standard Time 2~~~/softwarestudio.org/Tzfile/America/Chihuahua
 Mountain Standard Time~~~/softwarestudio.org/Tzfile/America/Denver
-Central America Standard Time~~~/softwarestudio.org/Tzfile/America/Regina
+Central America Standard Time~~~/softwarestudio.org/Tzfile/America/Costa_Rica
 Central Standard Time~~~/softwarestudio.org/Tzfile/America/Chicago
-Central Standard Time Mexico~~~/softwarestudio.org/Tzfile/America/Monterrey
+Central Standard Time (Mexico)~~~/softwarestudio.org/Tzfile/America/Monterrey
 Mexico Standard Time~~~/softwarestudio.org/Tzfile/America/Mexico_City
 Canada Central Standard Time~~~/softwarestudio.org/Tzfile/America/Regina
 SA Pacific Standard Time~~~/softwarestudio.org/Tzfile/America/Bogota
@@ -20,9 +20,9 @@
 Atlantic Standard Time~~~/softwarestudio.org/Tzfile/America/Halifax
 SA Western Standard Time~~~/softwarestudio.org/Tzfile/America/La_Paz
 Central Brazilian Standard Time~~~/softwarestudio.org/Tzfile/America/Manaus
-Pacific SA Standard Time~~~/softwarestudio.org/Tzfile/America/Santiago
+Pacific SA Standard Time~~~/softwarestudio.org/Tzfile/America/La_Paz
 Newfoundland Standard Time~~~/softwarestudio.org/Tzfile/America/St_Johns
-E. South America Standard Time~~~/softwarestudio.org/Tzfile/America/Sao_Paulo
+E. South America Standard Time~~~/softwarestudio.org/Tzfile/America/Bahia
 SA Eastern Standard Time~~~/softwarestudio.org/Tzfile/America/Argentina/Buenos_Aires
 Greenland Standard Time~~~/softwarestudio.org/Tzfile/America/Godthab
 Montevideo Standard Time~~~/softwarestudio.org/Tzfile/America/Montevideo
@@ -30,7 +30,7 @@
 Azores Standard Time~~~/softwarestudio.org/Tzfile/Atlantic/Azores
 Cape Verde Standard Time~~~/softwarestudio.org/Tzfile/Atlantic/Cape_Verde
 Greenwich Standard Time~~~/softwarestudio.org/Tzfile/Africa/Casablanca
-GMT Standard Time~~~
+GMT Standard Time~~~UTC
 W. Europe Standard Time~~~/softwarestudio.org/Tzfile/Europe/Berlin
 Central Europe Standard Time~~~/softwarestudio.org/Tzfile/Europe/Prague
 Romance Standard Time~~~/softwarestudio.org/Tzfile/Europe/Paris
@@ -46,7 +46,7 @@
 E. Europe Standard Time~~~/softwarestudio.org/Tzfile/Europe/Minsk
 Namibia Standard Time~~~/softwarestudio.org/Tzfile/Africa/Windhoek
 Arabic Standard Time~~~/softwarestudio.org/Tzfile/Asia/Baghdad
-Arab Standard Time~~~/softwarestudio.org/Tzfile/Asia/Riyadh
+Arab Standard Time~~~/softwarestudio.org/Tzfile/Asia/Qatar
 Russian Standard Time~~~/softwarestudio.org/Tzfile/Europe/Moscow
 E. Africa Standard Time~~~/softwarestudio.org/Tzfile/Africa/Nairobi
 Georgian Standard Time~~~/softwarestudio.org/Tzfile/Asia/Tbilisi



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]